Cleanup

N64Recomp · May 20, 2024 · 7925a95 · 7925a95
1 parent 1c459a3
commit 7925a95
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -6,7 +6,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-unix:
+  build-linux:
+    name: Build Linux
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -23,11 +24,12 @@ jobs:
           key: ${{ runner.os }}-N64ModernRuntime-ccache-${{ matrix.type }}
 
       - name: Install Linux Dependencies
-        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y ninja-build libgtk-3-dev lld llvm clang-15
 
+      - name: Install SDL2
+        run: |
           # Install SDL2
           echo ::group::install SDL2
 
@@ -38,20 +40,24 @@ jobs:
           tar -xzf SDL2-2.26.1.tar.gz
           cd SDL2-2.26.1
           ./configure
-          make -j 10
+          make -j $(nproc)
           sudo make install
           sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
           echo ::endgroup::
 
-      - name: Build N64ModernRuntime
+      - name: Configure cmake
         run: |-
           # enable ccache
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
 
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config ${{ matrix.type }} --target N64ModernRuntime -j $(nproc)
+          cmake -S . -B cmake-build -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang++-15 -DCMAKE_C_COMPILER=clang-15
+
+      - name: Build N64ModernRuntime
+        run: |-
+          cmake --build cmake-build --config ${{ matrix.type }} -j $(nproc)
 
   build-windows:
+    name: Build Windows
     runs-on: windows-latest
     strategy:
       matrix:
@@ -75,10 +81,13 @@ jobs:
       - name: Configure Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Build N64ModernRuntime
+      - name: Configure cmake
         run: |-
           # enable ccache
           set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
 
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fcxx-exceptions"
-          cmake --build cmake-build --config ${{ matrix.type }} --target N64ModernRuntime -j 8
+          cmake -S . -B cmake-build -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_FLAGS="-Xclang -fcxx-exceptions"
+
+      - name: Build N64ModernRuntime
+        run: |-
+          cmake --build cmake-build --config ${{ matrix.type }} -j 8