CI: Use ImageOS (ubuntu24) instead of runner.os (Linux) in cache keys#130200
CI: Use ImageOS (ubuntu24) instead of runner.os (Linux) in cache keys#130200hugovk merged 1 commit intopython:mainfrom
Conversation
| - name: Runner image version | ||
| run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV" |
There was a problem hiding this comment.
This was set but not used in this job.
| - name: "Runner image version" | ||
| run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV" |
There was a problem hiding this comment.
This wasn't being set in this job, so env.IMAGE_VERSION was evaluating as an empty string in the keys below.
|
Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13. |
|
Sorry, @hugovk, I could not cleanly backport this to |
|
Sorry, @hugovk, I could not cleanly backport this to |
…he keys (pythonGH-130200) (cherry picked from commit 3d7a141) Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
|
GH-130222 is a backport of this pull request to the 3.13 branch. |
…he keys (pythonGH-130200) (cherry picked from commit 3d7a141) Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
|
GH-130226 is a backport of this pull request to the 3.12 branch. |
|
And let's backport to 3.9-3.11 because they're still using |
|
Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10. |
|
Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11. |
|
Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9. |
|
Sorry, @hugovk, I could not cleanly backport this to |
|
Sorry, @hugovk, I could not cleanly backport this to |
|
Sorry, @hugovk, I could not cleanly backport this to |
|
GH-130252 is a backport of this pull request to the 3.11 branch. |
3.9 and 3.10 don't have these cache keys so don't need this backport. |
Problem
In #129834 we recently switched the
ubuntu-24.04-armrunners toubuntu-22.04-arm.However, the CI jobs consistently broken due to an unknown GCC option:
After clearing the config caches, a re-run passed:
This was the cache key for "Restore config.cache" is:
Which evaluates to
build_ubuntu_reusable-Linux-0.0.10-9cf14f6717fb4cec718ff086229088aa00b4e898b87da1d8f14119ec638f68e7for both runners.That is because
runner.osisLinuxandenv.IMAGE_VERSIONis0.0.10for both.So they both used the same cache.
Fix
env.IMAGE_VERSIONcomes from$ImageVersion, and there's also a$ImageOSwhich givesubuntu22orubuntu24.This will give us a fresh cache when we next change the OS version.