ci: use devkitpro/devkita64:latest

scribam · Oct 28, 2023 · 7a18760 · 7a18760
1 parent 652756d
commit 7a18760
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-latest
-    container: devkitpro/devkita64:20220128
+    container: devkitpro/devkita64:latest
 
     strategy:
       matrix:
@@ -18,7 +18,7 @@ jobs:
       - name: Set up build environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install awscli ccache ninja-build
+          sudo apt-get -y install awscli ccache
 
       - uses: actions/checkout@v3
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1777,8 +1777,8 @@ if(NINTENDO_SWITCH)
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:zip>
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:elf>
 			COMMAND ${CMAKE_AR} -x $<TARGET_FILE:flycast::res>
-			COMMAND ${CMAKE_AR} -rs flycast_libretro_libnx.a *.obj
-			COMMAND rm *.obj
+			COMMAND ${CMAKE_AR} -rs flycast_libretro_libnx.a *.o
+			COMMAND rm *.o
 			WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
 			DEPENDS xxHash::xxhash chdr-static zip ${PROJECT_NAME})
 	else()