Skip to content

Commit

Permalink
GH-43 Rollback to ccache for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Naros committed Dec 31, 2023
1 parent 049a8b8 commit 4450655
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 21 deletions.
9 changes: 1 addition & 8 deletions .github/actions/windows-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

- 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 || '');



14 changes: 1 addition & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 4450655

Please sign in to comment.