Skip to content

Fix colliding ccache-rolling-ci keys in CI #3776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbbrooks merged 1 commit into from
Jun 24, 2026
+10 −2
Merged

Fix colliding ccache-rolling-ci keys in CI #3776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ jobs:
restore-keys: ${{ env.CACHE_PREFIX }}
env:
GHA_CACHE_SAVE: always
CACHE_PREFIX: target_ws${{ matrix.env.CCOV && '-ccov' || '' }}-${{ matrix.env.IMAGE }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml', '.github/workflows/ci.yaml') }}
# The variant token (ccov/tidy/default) keeps caches built with different compilers/flags
# in separate key namespaces. Without it, the clang (clang-tidy) and gcc (deprecation/plain)
# rolling jobs share one key and restore each other's build tree, forcing a full rebuild.
CACHE_PREFIX: target_ws-${{ matrix.env.IMAGE }}-${{ matrix.env.CCOV && 'ccov' || matrix.env.CLANG_TIDY && 'tidy' || 'default' }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml', '.github/workflows/ci.yaml') }}
- name: Cache ccache
uses: rhaschke/cache@main
with:
Expand All @@ -149,7 +152,12 @@ jobs:
${{ env.CACHE_PREFIX }}
env:
GHA_CACHE_SAVE: always
CACHE_PREFIX: ccache-${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && '-ccov' || '' }}
# Use a distinct, non-nested suffix per build variant. GHA restore-keys match by prefix, and
# the old 'ccache-rolling-ci' prefix matched the 'ccache-rolling-ci-ccov' cache, so the gcc
# (deprecation) and clang (clang-tidy) jobs kept restoring the Debug+coverage ccov cache and
# missing on nearly every compile. 'ccov'/'tidy'/'default' are non-nested so each job restores
# only its own cache.
CACHE_PREFIX: ccache-${{ matrix.env.IMAGE }}-${{ matrix.env.CCOV && 'ccov' || matrix.env.CLANG_TIDY && 'tidy' || 'default' }}
- name: Configure ccache
run: |
mkdir -p ${{ env.CCACHE_DIR }}
Expand Down
Loading