Skip to content

Commit b537481

Browse files
committed
Trim and fix CI
Upstream's workflows came in with the 1.7.0 merge (fork master had none) and need adjustments to run cleanly on github.com: - upload-artifact pinned to v8 doesn't exist (max v7); revert the upstream "alignment" bump (0b4c6dd). - Linux and WII workflows are off-target for this fork; remove. - Root settings-header.pl didn't know the fork's `nsarray` setting type; treat like `null`. - machine.c and ui/sdl/sdlkeyboard.c include fusepb/FuseMenus.h without a guard, breaking autotools UI builds. Pre-existing fork issue, out of merge scope; drop the Fuse-UI fan-out jobs from build_macos.yml and build_windows.yml until the include is conditional. Libspectrum sub-builds, which pass, remain.
1 parent 18cd3a5 commit b537481

12 files changed

Lines changed: 5 additions & 864 deletions

.github/workflows/build_libspectrum_linux_sub.yml

Lines changed: 0 additions & 150 deletions
This file was deleted.

.github/workflows/build_libspectrum_macos_sub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
-C /usr/local/ -T.tar_files
145145
146146
- name: (12) Upload generated tar file
147-
uses: actions/upload-artifact@v8
147+
uses: actions/upload-artifact@v7
148148
with:
149149
name: libspectrum-installed-macos-${{ inputs.key }}
150150
path: |

.github/workflows/build_libspectrum_windows_sub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
-C /usr/local/i686-w64-mingw32/ .
224224
225225
- name: (15) Upload generated tar file
226-
uses: actions/upload-artifact@v8
226+
uses: actions/upload-artifact@v7
227227
with:
228228
name: libspectrum-installed-windows-${{ inputs.key }}
229229
path: |

.github/workflows/build_linux.yml

Lines changed: 0 additions & 115 deletions
This file was deleted.

.github/workflows/build_linux_sub.yml

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)