Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

CI: Use ImageOS (ubuntu24) instead of runner.os (Linux) in cache keys#130200

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.

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

Already on GitHub?Sign in to your account

Merged
hugovk merged 1 commit intopython:mainfromhugovk:3.14-ci-cache-key
Feb 17, 2025

Conversation

hugovk
Copy link
Member

Problem

In#129834 we recently switched theubuntu-24.04-arm runners 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:

key:${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}

Which evaluates tobuild_ubuntu_reusable-Linux-0.0.10-9cf14f6717fb4cec718ff086229088aa00b4e898b87da1d8f14119ec638f68e7 for both runners.

That is becauserunner.os isLinux andenv.IMAGE_VERSION is0.0.10 for both.

So they both used the same cache.

Fix

env.IMAGE_VERSION comes from$ImageVersion, and there's also a$ImageOS which givesubuntu22 orubuntu24.

This will give us a fresh cache when we next change the OS version.

@hugovkhugovk added the infraCI, GitHub Actions, buildbots, Dependabot, etc. labelFeb 16, 2025
Comment on lines -65 to -66
- name: Runner image version
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This was set but not used in this job.

Comment on lines +56 to +57
- name: "Runner image version"
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This wasn't being set in this job, soenv.IMAGE_VERSION was evaluating as an empty string in the keys below.

@hugovkhugovk merged commit3d7a141 intopython:mainFeb 17, 2025
57 checks passed
@hugovkhugovk deleted the 3.14-ci-cache-key branchFebruary 17, 2025 11:53
@miss-islington-app
Copy link

Thanks@hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry,@hugovk, I could not cleanly backport this to3.13 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 3d7a141c2f235b70dd6c2d64308022c4b77df131 3.13

@miss-islington-app
Copy link

Sorry,@hugovk, I could not cleanly backport this to3.12 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 3d7a141c2f235b70dd6c2d64308022c4b77df131 3.12

hugovk added a commit to hugovk/cpython that referenced this pull requestFeb 17, 2025
…he keys (pythonGH-130200)(cherry picked from commit3d7a141)Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app
Copy link

GH-130222 is a backport of this pull request to the3.13 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.13bugs and security fixes labelFeb 17, 2025
hugovk added a commit to hugovk/cpython that referenced this pull requestFeb 17, 2025
…he keys (pythonGH-130200)(cherry picked from commit3d7a141)Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app
Copy link

GH-130226 is a backport of this pull request to the3.12 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.12only security fixes labelFeb 17, 2025
@hugovk
Copy link
MemberAuthor

hugovk commentedFeb 18, 2025
edited
Loading

And let's backport to 3.9-3.11 because they're still usingubuntu-20.04 which will be fully unsupported by 2025-04-01, so this fix is needed before we upgrade those:

#122566 (comment)

@hugovkhugovk added needs backport to 3.9only security fixes needs backport to 3.10only security fixes needs backport to 3.11only security fixes labelsFeb 18, 2025
@miss-islington-app
Copy link

Thanks@hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks@hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks@hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry,@hugovk, I could not cleanly backport this to3.10 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 3d7a141c2f235b70dd6c2d64308022c4b77df131 3.10

@miss-islington-app
Copy link

Sorry,@hugovk, I could not cleanly backport this to3.11 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 3d7a141c2f235b70dd6c2d64308022c4b77df131 3.11

@miss-islington-app
Copy link

Sorry,@hugovk, I could not cleanly backport this to3.9 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 3d7a141c2f235b70dd6c2d64308022c4b77df131 3.9

@bedevere-app
Copy link

GH-130252 is a backport of this pull request to the3.11 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.11only security fixes labelFeb 18, 2025
@hugovk
Copy link
MemberAuthor

And let's backport to 3.9-3.11 because they're still usingubuntu-20.04 which will be fully unsupported by 2025-04-01, so this fix is needed before we upgrade those:

#122566 (comment)

3.9 and 3.10 don't have these cache keys so don't need this backport.

@hugovkhugovk removed the needs backport to 3.9only security fixes labelFeb 18, 2025
@hugovkhugovk removed the needs backport to 3.10only security fixes labelFeb 19, 2025
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@zwarezwarezware approved these changes

@ezio-melottiezio-melottiezio-melotti approved these changes

@AA-TurnerAA-TurnerAwaiting requested review from AA-TurnerAA-Turner is a code owner

Assignees

@hugovkhugovk

Labels
infraCI, GitHub Actions, buildbots, Dependabot, etc.skip issueskip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

3 participants
@hugovk@zware@ezio-melotti

[8]ページ先頭

©2009-2025 Movatter.jp