FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

CI: Include Python version in cache.config key by hugovk · Pull Request #111410 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

CI: Include Python version in cache.config key - #111410

Merged
hugovk merged 2 commits into
python:mainfrom
hugovk:ci-cache.config-key
Oct 28, 2023
ConversationCommits (2)ChecksFiles changed
Merged

CI: Include Python version in cache.config key#111410
hugovk merged 2 commits into
python:mainfrom
hugovk:ci-cache.config-key

Conversation

hugovk commented Oct 27, 2023

Copy link
Copy Markdown
Member

Yesterday, the actions/setup-python updated the Python version 3.x from 3.11 to 3.12 which caused build failures in the "Configure CPython" step of the check_generated_files job:

configure: loading cache config.cache
configure: error: `PKG_CONFIG_PATH' has changed since the previous run:
configure:   former value:  `/opt/hostedtoolcache/Python/3.11.6/x64/lib/pkgconfig'
configure:   current value: `/opt/hostedtoolcache/Python/3.12.0/x64/lib/pkgconfig'
configure: error: in `/home/runner/work/cpython/cpython':
configure: error: changes in the environment can compromise the build
configure: error: run `make distclean' and/or `rm config.cache'
	    and start over
Error: Process completed with exit code 1.

https://github.com/python/cpython/actions/runs/6658472864/job/18096250159

Deleting the check_generated_files-Linux-52d68ba849d6fda1735c7031561b5102961493401ad71cfb10f4fcbca7a3c9d4 file from https://github.com/python/cpython/actions/caches and restarting the job, fixed it (the filename was shown in the "Restore config.cache" step.

The root problem is the Python version isn't part of the cache file's key.

We need to include it, so when the version changes, there'll be a new key, and so the old cache file won't be used anymore (and eventually deleted), and a new one will be generated.

So let's add ${{ env.pythonLocation }} to the key used by actions/cache.

hugovk requested a review from ezio-melotti as a code owner October 27, 2023 19:29
hauntsaninja approved these changes Oct 27, 2023
View reviewed changes

hauntsaninja left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Thanks for figuring it out and fixing!

hugovk merged commit 9d4a1a4 into python:main Oct 28, 2023
hugovk deleted the ci-cache.config-key branch October 28, 2023 07:23
hugovk added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Oct 28, 2023

miss-islington-app Bot commented Oct 28, 2023

Copy link
Copy Markdown

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

miss-islington-app Bot commented Oct 28, 2023

Copy link
Copy Markdown

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 28, 2023
CI: Include Python version in cache.config key (pythonGH-111410)
2932360 
* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
(cherry picked from commit 9d4a1a4)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

bedevere-app Bot commented Oct 28, 2023

Copy link
Copy Markdown

GH-111421 is a backport of this pull request to the 3.12 branch.

bedevere-app Bot removed the needs backport to 3.12 only security fixes label Oct 28, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 28, 2023
CI: Include Python version in cache.config key (pythonGH-111410)
33bd7e0 
* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
(cherry picked from commit 9d4a1a4)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

bedevere-app Bot commented Oct 28, 2023

Copy link
Copy Markdown

GH-111422 is a backport of this pull request to the 3.11 branch.

bedevere-app Bot removed the needs backport to 3.11 only security fixes label Oct 28, 2023
hugovk added a commit that referenced this pull request Oct 28, 2023
[3.11] CI: Include Python version in cache.config key (GH-111410) (#1…
da1736b 
…11422)

CI: Include Python version in cache.config key (GH-111410)

* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
(cherry picked from commit 9d4a1a4)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
hugovk added a commit that referenced this pull request Oct 28, 2023
[3.12] CI: Include Python version in cache.config key (GH-111410) (#1…
cf29a2f 
…11421)

CI: Include Python version in cache.config key (GH-111410)

* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
(cherry picked from commit 9d4a1a4)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
iritkatriel pushed a commit to iritkatriel/cpython that referenced this pull request Oct 29, 2023
CI: Include Python version in cache.config key (python#111410)
b632fc1 
* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
hugovk added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Oct 31, 2023

miss-islington-app Bot commented Oct 31, 2023

Copy link
Copy Markdown

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

miss-islington-app Bot commented Oct 31, 2023

Copy link
Copy Markdown

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

hugovk removed needs backport to 3.12 only security fixes needs backport to 3.11 only security fixes labels Oct 31, 2023

miss-islington-app Bot commented Oct 31, 2023

Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 9d4a1a480b65196c3aabbcd2d165d1fb86d0c8e5 3.11

miss-islington-app Bot commented Oct 31, 2023

Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 9d4a1a480b65196c3aabbcd2d165d1fb86d0c8e5 3.12

hugovk commented Oct 31, 2023

Copy link
Copy Markdown
Member Author

This was already backported 🙃

aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
CI: Include Python version in cache.config key (python#111410)
208ef64 
* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
CI: Include Python version in cache.config key (python#111410)
0e1d4f6 
* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

hauntsaninja hauntsaninja approved these changes
ezio-melotti ezio-melotti approved these changes

Assignees

hugovk

Labels

skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL