From 22ac0f30c75866427956f12801178f72beb5b488 Mon Sep 17 00:00:00 2001 From: dcvz Date: Fri, 17 May 2024 17:58:24 +0200 Subject: [PATCH] bmp ubuntu so we can get clang 15 --- .github/workflows/validate.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b879979..812dbeb 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: build-unix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: type: [ Debug, Release ] @@ -27,7 +27,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt-get update - sudo apt-get install -y ninja-build libsdl2-dev libgtk-3-dev lld llvm-12 clang-12 gcc-10 + sudo apt-get install -y ninja-build libsdl2-dev libgtk-3-dev lld llvm-15 clang-15 # Install SDL2 echo ::group::install SDL2 @@ -59,7 +59,7 @@ jobs: export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" # Build N64Recomp & RSPRecomp - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build cmake --build cmake-build --config Release --target N64Recomp -j 8 cmake --build cmake-build --config Release --target RSPRecomp -j 8 @@ -76,7 +76,7 @@ jobs: # 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++ -DCMAKE_C_COMPILER=clang -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build + 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 Zelda64Recompiled -j 8 - name: Archive Zelda64Recomp uses: actions/upload-artifact@v2