From 48e2adeebf6e613d07421797347bae78eb50f9e6 Mon Sep 17 00:00:00 2001 From: David Chavez Date: Sat, 25 May 2024 20:44:27 +0200 Subject: [PATCH] Fix CI config (#32) --- .github/workflows/validate.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 0bb26eb..df62c8a 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -23,7 +23,7 @@ jobs: - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ runner.os }}-rt64-ccache + key: ${{ runner.os }}-rt64-ccache-${{ matrix.type }} - name: Install Windows Dependencies if: runner.os == 'Windows' run: | @@ -58,13 +58,14 @@ jobs: # enable ccache export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build - cmake --build cmake-build --config Debug --target rt64 -j 8 + 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 --build cmake-build --config ${{ matrix.type }} --target rt64 -j $(nproc) - name: Build RT64 (Windows) if: runner.os == 'Windows' run: |- # enable ccache set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH" + $cpuCores = (Get-CimInstance -ClassName Win32_Processor).NumberOfLogicalProcessors 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 --build cmake-build --config Debug --target rt64 -j 8 + cmake --build cmake-build --config ${{ matrix.type }} --target rt64 -j $cpuCores