Skip to content

Commit 43e30f9

Browse files
committed
ci: modified how to run ubuntu and windows tests
1 parent 6dc528a commit 43e30f9

File tree

2 files changed

+34
-26
lines changed

2 files changed

+34
-26
lines changed

.github/workflows/test.yml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ on:
44
push:
55

66
jobs:
7-
test-lin:
7+
test:
88
strategy:
99
matrix:
10-
os: ['ubuntu']
10+
os: ['ubuntu', 'windows']
1111
pyver: ['3.8', '3.9', '3.10', '3.11', '3.12']
1212
runs-on: ${{ matrix.os }}-latest
1313
name: ${{ matrix.os }} | ${{ matrix.pyver }}
14+
exclude:
15+
os: ['windows']
16+
pyver: ['3.8', '3.9', '3.10', '3.11']
1417
steps:
1518
- name: Checkout repository
1619
uses: actions/checkout@v4
17-
with:
18-
submodules: true
19-
fetch-depth: 0
2020
- name: Set up Python ${{ matrix.pyver }}
2121
uses: actions/setup-python@v5
2222
with:
@@ -25,22 +25,30 @@ jobs:
2525
run: pip install . && pip install pytest
2626
- name: Run tests
2727
run: |
28-
source tests/mocks/source-me.sh && make test
29-
cd examples/projects && bash regress.sh
30-
test-win:
31-
runs-on: windows-latest
32-
name: windows | 3.12
33-
steps:
34-
- name: Checkout repository
35-
uses: actions/checkout@v4
36-
with:
37-
submodules: true
38-
fetch-depth: 0
39-
- name: Set up Python 3.12
40-
uses: actions/setup-python@v5
41-
with:
42-
python-version: 3.12
43-
- name: Install dependencies
44-
run: pip install . && pip install pytest
45-
- name: Run tests
46-
run: make test
28+
make test
29+
30+
# source tests/mocks/source-me.sh && make test
31+
# cd examples/projects && bash regress.sh
32+
# test-win:
33+
# strategy:
34+
# matrix:
35+
# os: ['windows']
36+
# pyver: ['3.12']
37+
# runs-on: ${{ matrix.os }}-latest
38+
# name: ${{ matrix.os }} | ${{ matrix.pyver }}
39+
# steps:
40+
# - name: Checkout repository
41+
# uses: actions/checkout@v4
42+
# - name: Set up Python ${{ matrix.pyver }}
43+
# uses: actions/setup-python@v5
44+
# with:
45+
# python-version: ${{ matrix.pyver }}
46+
# - name: Install dependencies
47+
# run: pip install . && pip install pytest
48+
# - name: Run tests
49+
# run: |
50+
# source tests/mocks/source-me.sh && make test
51+
# cd examples/projects && bash regress.sh
52+
53+
# $Env:PATH += ";${{ github.workspace }}\tests\mocks"
54+
# cd examples\projects && python3 vivado.py

tests/test_tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ def generate(tool, part):
8585
prj.add_hook('postbit', 'HOOK16')
8686
try:
8787
prj.make()
88-
except Exception:
88+
except RuntimeError:
8989
pass
9090
try:
9191
prj.prog()
92-
except Exception:
92+
except RuntimeError:
9393
pass

0 commit comments

Comments
 (0)