From 11b763fb4235e098c89381d917ced22c7557afa1 Mon Sep 17 00:00:00 2001 From: dcvz Date: Fri, 17 May 2024 17:29:11 +0200 Subject: [PATCH] different way of using clang-12 compiler --- .github/workflows/validate.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index c0008cb..2037ecc 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -59,16 +59,13 @@ 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_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=clang++-12 -DCMAKE_C_COMPILER=clang-12 -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 # Copy N64Recomp & RSPRecomp to root directory cp cmake-build/N64Recomp .. cp cmake-build/RSPRecomp .. - env: - CC: clang-12 - CXX: clang++-12 - name: Run N64Recomp & RSPRecomp run: | ./N64Recomp us.rev1.toml @@ -79,11 +76,8 @@ 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_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++ -DCMAKE_C_COMPILER=clang -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j 8 - env: - CC: clang-12 - CXX: clang++-12 - name: Archive Zelda64Recomp uses: actions/upload-artifact@v2 with: