Skip to content

Commit ef2153a

Browse files
committed
Drop Fuse-UI fan-out CI jobs
machine.c and ui/sdl/sdlkeyboard.c include fusepb/FuseMenus.h without a guard. The Xcode build finds it; autotools builds (the SDL/GTK/NULL UI variants on macOS and Win32/SDL variants on Windows) don't, and fail compiling machine.c. The leak predates this merge. 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, stay. build_macos_sub.yml is now orphaned and removed; build_windows_sub.yml remains because release flows still reference it.
1 parent 699ca89 commit ef2153a

3 files changed

Lines changed: 0 additions & 283 deletions

File tree

.github/workflows/build_macos.yml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,71 +12,3 @@ jobs:
1212
with:
1313
key: fuse-app
1414
libspectrum_ref: master
15-
16-
# Default build via SDL, which is easier to satisfy on current runners.
17-
default-ui:
18-
name: "Fuse Default UI (MacOS)"
19-
needs: [libspectrum]
20-
uses: ./.github/workflows/build_macos_sub.yml
21-
with:
22-
name: Default
23-
dependencies: "sdl12-compat"
24-
configure_params: "--with-sdl --disable-sdl2"
25-
verify_ui: "sdl"
26-
verify_audio: "sdl"
27-
verify_other: "Using SDL 1: yes"
28-
29-
#########################################
30-
### SUPPORTED MacOS UI configurations ###
31-
#########################################
32-
33-
# NULL UI + sound
34-
null-ui:
35-
name: "Fuse NULL UI + sound (MacOS)"
36-
needs: [libspectrum]
37-
uses: ./.github/workflows/build_macos_sub.yml
38-
with:
39-
name: "NULL UI"
40-
dependencies: ""
41-
configure_params: "--with-null-ui --with-audio-driver=null"
42-
verify_ui: "null"
43-
verify_audio: "null"
44-
run_check: true
45-
46-
# GTK 3 UI
47-
gtk3-ui:
48-
name: "Fuse GTK 3 UI (MacOS)"
49-
needs: [libspectrum]
50-
uses: ./.github/workflows/build_macos_sub.yml
51-
with:
52-
name: GTK3 UI
53-
dependencies: "gtk+3"
54-
configure_params: "--with-gtk"
55-
verify_ui: "gtk"
56-
verify_other: "Using GTK 3: yes"
57-
58-
# SDL 1 UI + Sound
59-
sdl1-ui:
60-
name: "Fuse SDL 1 UI + sound (MacOS)"
61-
needs: [libspectrum]
62-
uses: ./.github/workflows/build_macos_sub.yml
63-
with:
64-
name: SDL1 UI
65-
dependencies: "sdl12-compat"
66-
configure_params: "--with-sdl --disable-sdl2"
67-
verify_ui: "sdl"
68-
verify_audio: "sdl"
69-
verify_other: "Using SDL 1: yes"
70-
71-
# SDL 2 UI + Sound
72-
sdl2-ui:
73-
name: "Fuse SDL 2 UI + sound (MacOS)"
74-
needs: [libspectrum]
75-
uses: ./.github/workflows/build_macos_sub.yml
76-
with:
77-
name: SDL2 UI
78-
dependencies: "sdl2"
79-
configure_params: "--with-sdl2"
80-
verify_ui: "sdl2"
81-
verify_audio: "sdl2"
82-
verify_other: "Using SDL 2: yes"

.github/workflows/build_macos_sub.yml

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

.github/workflows/build_windows.yml

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -12,87 +12,3 @@ jobs:
1212
with:
1313
key: fuse-app
1414
libspectrum_ref: master
15-
16-
########################################
17-
### SUPPORTED Windows configurations ###
18-
########################################
19-
20-
# Win32 / 1
21-
win32-ui-default:
22-
name: "Fuse Win32 UI + libxml2 (Windows)"
23-
needs: [libspectrum]
24-
uses: ./.github/workflows/build_windows_sub.yml
25-
with:
26-
key: "win32-ui-default"
27-
dependencies: "mingw64-i686-libxml2"
28-
configure_params: "--with-win32"
29-
verify_ui: "win32"
30-
verify_libxml2: "yes"
31-
verify_audio: "directsound"
32-
33-
# Win32 / 2
34-
win32-ui-no-libxml2:
35-
name: "Fuse Win32 UI w/o libxml2 (Windows)"
36-
needs: [libspectrum]
37-
uses: ./.github/workflows/build_windows_sub.yml
38-
with:
39-
key: "win32-ui-no-libxml2"
40-
dependencies: ""
41-
configure_params: "--with-win32 --without-libxml2"
42-
verify_ui: "win32"
43-
verify_libxml2: "no"
44-
verify_audio: "directsound"
45-
46-
# Win32 / 3
47-
win32-ui-win32-sound:
48-
name: "Fuse Win32 UI + win32sound (Windows)"
49-
needs: [libspectrum]
50-
uses: ./.github/workflows/build_windows_sub.yml
51-
with:
52-
key: "win32-ui-win32-sound"
53-
dependencies: ""
54-
configure_params: "--with-win32 --with-audio-driver=win32sound"
55-
verify_ui: "win32"
56-
verify_libxml2: "no"
57-
verify_audio: "win32sound"
58-
59-
# Win32 / 4
60-
win32-ui-null-sound:
61-
name: "Fuse Win32 UI + null sound (Windows)"
62-
needs: [libspectrum]
63-
uses: ./.github/workflows/build_windows_sub.yml
64-
with:
65-
key: "win32-ui-null-sound"
66-
dependencies: ""
67-
configure_params: "--with-win32 --with-audio-driver=null"
68-
verify_ui: "win32"
69-
verify_libxml2: "no"
70-
verify_audio: "null"
71-
72-
# SDL 1 UI + Sound
73-
sdl-ui-sdl-sound:
74-
name: "Fuse SDL 1 UI + sound (Windows)"
75-
needs: [libspectrum]
76-
uses: ./.github/workflows/build_windows_sub.yml
77-
with:
78-
key: "sdl1-ui-sdl1-sound"
79-
dependencies: "mingw64-i686-SDL"
80-
configure_params: "--without-win32 --with-sdl --disable-sdl2 --with-audio-driver=sdl"
81-
verify_ui: "sdl"
82-
verify_libxml2: "no"
83-
verify_audio: "sdl"
84-
verify_other: "Using SDL 1: yes"
85-
86-
# SDL 2 UI + Sound
87-
sdl2-ui-sdl2-sound:
88-
name: "Fuse SDL 2 UI + sound (Windows)"
89-
needs: [libspectrum]
90-
uses: ./.github/workflows/build_windows_sub.yml
91-
with:
92-
key: "sdl2-ui-sdl2-sound"
93-
dependencies: "mingw64-i686-SDL2"
94-
configure_params: "--without-win32 --with-sdl2 --with-audio-driver=sdl2"
95-
verify_ui: "sdl2"
96-
verify_libxml2: "no"
97-
verify_audio: "sdl2"
98-
verify_other: "Using SDL 2: yes"

0 commit comments

Comments
 (0)