Skip to content

Commit 7d9cce4

Browse files
tbdyereinauer
authored andcommitted
ci: enable Windows integration and tools-smoke CI
Remove the Windows exclude blocks from integration-tests and tools-smoke matrix jobs. Add a conditional pre-install step for machine68k-amifuse on Windows runners, working around upstream machine68k issues #8 and #9.
1 parent 1f9e64e commit 7d9cce4

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
os: [ubuntu-latest, macos-latest, windows-latest]
47-
exclude:
48-
# Windows excluded: machine68k segfaults due to opcode table
49-
# over-read (cnvogelg/machine68k#8) and JMP/CAS collision (#9).
50-
# Remove this exclude block once upstream fixes land.
51-
- os: windows-latest
5247
steps:
5348
- uses: actions/checkout@v4
5449
with:
@@ -67,6 +62,14 @@ jobs:
6762
git clone --depth 1 https://github.com/reinauer/AmiFUSE-testing.git ../AmiFUSE-testing
6863
continue-on-error: true
6964

65+
- name: Install machine68k-amifuse (Windows)
66+
# Upstream machine68k lacks Windows fixes (cnvogelg/machine68k#8,
67+
# #9). The machine68k-amifuse fork includes all fixes with
68+
# pre-built Windows wheels.
69+
# Remove this step once upstream machine68k merges the fixes.
70+
if: runner.os == 'Windows'
71+
run: pip install "machine68k-amifuse>=0.4.1.post1"
72+
7073
- name: Install dependencies
7174
run: |
7275
python -m pip install --upgrade pip
@@ -93,11 +96,6 @@ jobs:
9396
fail-fast: false
9497
matrix:
9598
os: [ubuntu-latest, macos-latest, windows-latest]
96-
exclude:
97-
# Windows excluded: machine68k segfaults due to opcode table
98-
# over-read (cnvogelg/machine68k#8) and JMP/CAS collision (#9).
99-
# Remove this exclude block once upstream fixes land.
100-
- os: windows-latest
10199
steps:
102100
- uses: actions/checkout@v4
103101
with:
@@ -116,6 +114,14 @@ jobs:
116114
git clone --depth 1 https://github.com/reinauer/AmiFUSE-testing.git ../AmiFUSE-testing
117115
continue-on-error: true
118116

117+
- name: Install machine68k-amifuse (Windows)
118+
# Upstream machine68k lacks Windows fixes (cnvogelg/machine68k#8,
119+
# #9). The machine68k-amifuse fork includes all fixes with
120+
# pre-built Windows wheels.
121+
# Remove this step once upstream machine68k merges the fixes.
122+
if: runner.os == 'Windows'
123+
run: pip install "machine68k-amifuse>=0.4.1.post1"
124+
119125
- name: Install dependencies
120126
run: |
121127
python -m pip install --upgrade pip

0 commit comments

Comments
 (0)