Skip to content

Commit b2178db

Browse files
committed
Fix CI regressions
This addresses multiple CI failures related to Architecture tests and SDL_MIXER installation across different platforms.
1 parent 098be26 commit b2178db

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ jobs:
283283
- name: Architecture test
284284
env:
285285
CC: ${{ steps.install_cc.outputs.cc }}
286-
LATEST_RELEASE: dummy
287286
run: |
288287
.ci/riscv-tests.sh
289288
if: ${{ always() }}
@@ -342,7 +341,8 @@ jobs:
342341
- uses: actions/checkout@v4
343342
- name: install-dependencies
344343
run: |
345-
brew install make dtc expect sdl2 sdl2_mixer bc e2fsprogs p7zip llvm@18 dcfldd
344+
brew install make dtc expect sdl2 bc e2fsprogs p7zip llvm@18 dcfldd
345+
brew install sdl2_mixer || echo "Warning: sdl2_mixer installation failed, continuing without SDL_MIXER support"
346346
.ci/riscv-toolchain-install.sh
347347
echo "${{ github.workspace }}/toolchain/bin" >> $GITHUB_PATH
348348
echo "$(brew --prefix llvm@18)/bin" >> $GITHUB_PATH
@@ -489,7 +489,6 @@ jobs:
489489
- name: Architecture test
490490
env:
491491
CC: ${{ steps.install_cc.outputs.cc }}
492-
LATEST_RELEASE: dummy
493492
run: |
494493
python3 -m venv venv
495494
. venv/bin/activate

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ $(warning No sdl2-config in $$PATH. Check SDL2 installation in advance)
188188
override ENABLE_SDL := 0
189189
endif
190190
ifeq (1, $(shell pkg-config --exists SDL2_mixer; echo $$?))
191-
$(warning No SDL2_mixer lib installed. Check SDL2_mixer installation in advance)
192-
override ENABLE_SDL := 0
191+
$(warning No SDL2_mixer lib installed. SDL2_mixer support will be disabled)
193192
override ENABLE_SDL_MIXER := 0
194193
endif
195194
endif

0 commit comments

Comments
 (0)