diff --git a/.github/actions/windows-deps/action.yml b/.github/actions/windows-deps/action.yml index f57f24de..49f25aab 100644 --- a/.github/actions/windows-deps/action.yml +++ b/.github/actions/windows-deps/action.yml @@ -9,21 +9,14 @@ runs: with: cmake-version: '3.28' - - name: Install Ninja and SCCache (Windows) + - name: Install Ninja (Windows) shell: powershell run: | choco install ninja - choco install sccache # This forces the use of MSVC rather than GCC - uses: ilammy/msvc-dev-cmd@v1.12.1 - - name: Configure sccache - uses: actions/github-script@v6 - with: - script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); - core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 629b3cef..218215df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,16 +81,6 @@ jobs: with: key: ccache-${{ matrix.identifier }} - - name: sccache (Windows) - if: startsWith(matrix.identifier, 'windows-') - uses: actions/cache@v2 - with: - path: | - ~/AppData/Local/Mozilla/sccache - key: sccache-${{ matrix.identifier }} - restore-keys: | - sccache-${{ matrix.identifier }} - - name: Build Orchestrator (Linux/MacOS) if: startsWith(matrix.identifier, 'linux-') || startsWith(matrix.identifier, 'macos-') shell: sh @@ -100,11 +90,9 @@ jobs: - name: Build Orchestrator (Windows) if: startsWith(matrix.identifier, 'windows-') - env: - SCCACHE_GHA_ENABLED: "true" shell: bash run: | - cmake -B '${{ github.workspace }}/.out-${{ matrix.identifier }}' -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -S '${{ github.workspace }}' -G Ninja + cmake -B '${{ github.workspace }}/.out-${{ matrix.identifier }}' -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -S '${{ github.workspace }}' -G Ninja cmake --build '${{ github.workspace }}/.out-${{ matrix.identifier }}' --target orchestrator -j 18 - name: Prepare addon files