File tree Expand file tree Collapse file tree 2 files changed +17
-9
lines changed Expand file tree Collapse file tree 2 files changed +17
-9
lines changed Original file line number Diff line number Diff line change @@ -283,8 +283,14 @@ jobs:
283283    - name : Architecture test 
284284      env :
285285        CC : ${{ steps.install_cc.outputs.cc }} 
286-         LATEST_RELEASE : dummy 
287286      run : | 
287+             . .ci/common.sh 
288+             export LATEST_RELEASE=$(download_with_headers "https://api.github.com/repos/sysprog21/rv32emu-prebuilt/releases" \ 
289+                                                           "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ 
290+                                            | grep '"tag_name"' \ 
291+                                            | grep "sail" \ 
292+                                            | head -n 1 \ 
293+                                            | sed -E 's/.*"tag_name": "([^"]+)".*/\1/') 
288294            .ci/riscv-tests.sh 
289295if : ${{ always() }} 
290296
@@ -342,7 +348,8 @@ jobs:
342348     - uses : actions/checkout@v4 
343349     - name : install-dependencies 
344350       run : | 
345-              brew install make dtc expect sdl2 sdl2_mixer bc e2fsprogs p7zip llvm@18 dcfldd 
351+              brew install make dtc expect sdl2 bc e2fsprogs p7zip llvm@18 dcfldd 
352+              brew install sdl2_mixer || echo "Warning: sdl2_mixer installation failed, continuing without SDL_MIXER support" 
346353             .ci/riscv-toolchain-install.sh 
347354             echo "${{ github.workspace }}/toolchain/bin" >> $GITHUB_PATH 
348355             echo "$(brew --prefix llvm@18)/bin" >> $GITHUB_PATH 
@@ -489,8 +496,14 @@ jobs:
489496     - name : Architecture test 
490497       env :
491498         CC : ${{ steps.install_cc.outputs.cc }} 
492-          LATEST_RELEASE : dummy 
493499       run : | 
500+              . .ci/common.sh 
501+              export LATEST_RELEASE=$(download_with_headers "https://api.github.com/repos/sysprog21/rv32emu-prebuilt/releases" \ 
502+                                                            "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ 
503+                                             | grep '"tag_name"' \ 
504+                                             | grep "sail" \ 
505+                                             | head -n 1 \ 
506+                                             | sed -E 's/.*"tag_name": "([^"]+)".*/\1/') 
494507             python3 -m venv venv 
495508             . venv/bin/activate 
496509             .ci/riscv-tests.sh 
Original file line number Diff line number Diff line change @@ -207,15 +207,10 @@ $(warning No sdl2-config in $$PATH. Check SDL2 installation in advance)
207207override  ENABLE_SDL  := 0
208208endif 
209209ifeq  (1, $(shell  pkg-config --exists SDL2_mixer; echo $$? ) )
210- $(warning No SDL2_mixer lib installed. Check SDL2_mixer installation in advance)
211- override  ENABLE_SDL  := 0
210+ $(warning No SDL2_mixer lib installed. SDL2_mixer support will be disabled)
212211override  ENABLE_SDL_MIXER  := 0
213212endif 
214213endif 
215- else 
216- #  Disable SDL_MIXER for emscripten builds to avoid SDL2_mixer port compilation issues
217- #  The emscripten-ports/SDL2_mixer was archived in Jan 2024 with unfixable warnings
218- override  ENABLE_SDL_MIXER  := 0
219214endif 
220215$(call set-feature, SDL)
221216$(call set-feature, SDL_MIXER)
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments