Skip to content

Commit fa3f43d

Browse files
committed
ci: fixed vcpkg binary assets caching for code analysis workflow
1 parent 535654a commit fa3f43d

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: "codeql-analysis"
1313

1414
on:
1515
push:
16-
branches: [ 'master', 'codeql-fix' ]
16+
branches: [ master ]
1717
paths-ignore:
1818
- 'documentation/**'
1919

@@ -48,19 +48,8 @@ jobs:
4848
VCPKG_ROOT: ${{ github.workspace }}/external/vcpkg
4949
# Tells vcpkg where binary packages are stored.
5050
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/external/vcpkg/bincache
51-
# Let's use GitHub Action cache as storage for the vcpkg Binary Caching feature.
52-
VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
5351

5452
steps:
55-
# Set env vars needed for vcpkg to leverage the GitHub Action cache as a storage
56-
# for Binary Caching.
57-
- name: Set env vars needed for vcpkg to leverage the GitHub Action cache
58-
uses: actions/github-script@v6
59-
with:
60-
script: |
61-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
62-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
63-
6453
- name: Checkout repository
6554
uses: actions/checkout@v4
6655
with:
@@ -97,8 +86,8 @@ jobs:
9786

9887
# Restore vcpkg from the GitHub Action cache service. Note that packages are restored by vcpkg's binary caching
9988
# when it is being run afterwards by CMake.
100-
- name: Restore vcpkg
101-
uses: actions/cache@v3
89+
- name: Caching of vcpkg assets
90+
uses: actions/cache@v4
10291
with:
10392
# The first path is the location of vcpkg: it contains the vcpkg executable and data files, as long as the
10493
# built package archives (aka binary cache) which are located by VCPKG_DEFAULT_BINARY_CACHE env var.
@@ -111,7 +100,7 @@ jobs:
111100
!${{ env.VCPKG_ROOT }}/installed
112101
# The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
113102
key: |
114-
${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}
103+
vcpkg-${{ hashFiles('.git/modules/external/vcpkg/HEAD') }}-${{ runner.os }}
115104
116105
- name: Configure CMake
117106
working-directory: ${{ github.workspace }}/build

0 commit comments

Comments
 (0)