squeaky clean

Signed-off-by: Daniel Thamdrup <[email protected]>
diasurgical · Feb 7, 2024 · ab9b0a3 · ab9b0a3
1 parent 174d44f
commit ab9b0a3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/3ds.yml b/.github/workflows/3ds.yml
@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container: devkitpro/devkitarm:latest
     steps:
       - name: Checkout
@@ -33,8 +33,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          apt-get update && \
-          apt-get install -y --no-install-recommends --no-install-suggests \
+          apt-get update
+          apt-get install -y \
             ffmpeg \
             gettext
 
@@ -48,7 +48,10 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -S. -Bbuild -GNinja \
+          cmake \
+            -S . \
+            -B build \
+            -G Ninja \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake
 

diff --git a/.github/workflows/amiga-m68k.yml b/.github/workflows/amiga-m68k.yml
@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container: amigadev/crosstools:m68k-amigaos-gcc10
     steps:
       - name: Checkout
@@ -36,10 +36,13 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -S. -Bbuild -GNinja \
-            -DM68K_COMMON="-s -fbbb=- -ffast-math -O2" \
-            -DM68K_CPU=68040 \
-            -DM68K_FPU=hard
+          cmake \
+            -S . \
+            -B build \
+            -G Ninja \
+            -D M68K_COMMON="-s -fbbb=- -ffast-math -O2" \
+            -D M68K_CPU=68040 \
+            -D M68K_FPU=hard
 
       - name: Build DevilutionX
         run: cmake --build build

diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
@@ -24,7 +24,7 @@ concurrency:
 jobs:
   build:
     runs-on: macos-14
-    container: devkitpro/devkita64:20240120
+    container: devkitpro/devkita64:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -39,9 +39,11 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -S. -Bbuild \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
+          cmake \
+            -S . \
+            -B build \
+            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+            -D CMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
 
       - name: Build DevilutionX
         run: cmake --build build -j$(nproc)

diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml
@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container: vitasdk/vitasdk:latest
     steps:
       - name: Checkout
@@ -37,11 +37,13 @@ jobs:
             gettext \
             git \
             samurai
-               
 
       - name: Configure CMake
         run: |
-          cmake -S. -Bbuild -GNinja \
+          cmake \
+            -S . \
+            -B build \
+            -G Ninja \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake