Skip to content

Commit 5e4a50a

Browse files
author
codethinki
committed
caching vcpkg on linux should now work
1 parent 5395e2e commit 5e4a50a

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/actions/setup-windows/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ runs:
3232
shell: pwsh
3333
run: |
3434
pip install --upgrade -r .github/requirements.txt
35-
$pythonScriptPath = (python -c "import sysconfig; print(sysconfig.get_path('scripts'))")
36-
echo "$pythonScriptPath" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
3735
3836
- name: Check CMake Version
3937
shell: pwsh

.github/workflows/test.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
uses: actions/cache@v4
5151
with:
5252
path: |
53-
out/build/ci-linux-*/vcpkg_installed
54-
key: vcpkg-installed-linux-${{ hashFiles('vcpkg.json') }}
53+
out/build/ci-linux-${{ matrix.compiler }}-release/vcpkg_installed
54+
key: vcpkg-installed-linux-${{ matrix.compiler }}-${{ hashFiles('vcpkg.json') }}
5555
restore-keys: |
56-
vcpkg-installed-linux-
56+
vcpkg-installed-linux-${{ matrix.compiler }}-
5757
5858
- name: Configure
5959
uses: ./.github/actions/run-linux
@@ -72,6 +72,11 @@ jobs:
7272
with:
7373
run: ctest --preset ci-linux-${{ matrix.compiler }}-release --output-on-failure --tests-regex "cth_tests|cth_coro_tests"
7474

75+
- name: Fix permissions
76+
if: always()
77+
run: sudo chown -R $(id -u):$(id -g) out/build
78+
79+
7580
windows-test:
7681
name: Windows Test (${{ matrix.compiler }})
7782
runs-on: windows-latest

0 commit comments

Comments
 (0)