Skip to content

Commit b871f2a

Browse files
committed
pyproject: use yowasp-yosys for tests.
This change means that tests will succeed even if the system Yosys binary is broken. yices2 must still be present on the system.
1 parent fcafad1 commit b871f2a

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.env.toolchain

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
AMARANTH_USE_YOSYS=system
2+
YOSYS=yowasp-yosys
3+
SBY=yowasp-sby
4+
SMTBMC=yowasp-yosys-smtbmc
5+
# examples
6+
NEXTPNR_ICE40=yowasp-nextpnr-ice40
7+
ICEPACK=yowasp-icepack

.github/workflows/main.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,9 @@ jobs:
4646
sudo add-apt-repository 'deb http://ppa.launchpad.net/sri-csl/formal-methods/ubuntu bionic main'
4747
sudo apt-get update
4848
sudo apt-get install yices2
49-
pip install codecov yowasp-yosys
49+
pip install codecov
5050
pdm install --dev
5151
- name: Run tests
52-
env:
53-
YOSYS: yowasp-yosys
54-
NEXTPNR_ICE40: yowasp-nextpnr-ice40
55-
ICEPACK: yowasp-icepack
56-
SBY: yowasp-sby
57-
SMTBMC: yowasp-yosys-smtbmc
5852
run: |
5953
pdm run test
6054
- name: Submit code coverage

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ includes = ["amaranth/"]
4949

5050
[tool.pdm.dev-dependencies]
5151
test = [
52+
"yowasp-yosys",
5253
"coverage",
5354
]
5455
docs = [
@@ -62,6 +63,8 @@ examples = [
6263
]
6364

6465
[tool.pdm.scripts]
66+
_.env_file = ".env.toolchain"
67+
6568
test.composite = ["test-code", "test-docs"]
6669
test-code.env = {PYTHONWARNINGS = "error"}
6770
test-code.cmd = "python -m coverage run -m unittest discover -t . -s tests -v"

0 commit comments

Comments
 (0)