[Backport 7.80.x] Move macOS PBS pins into builder inputs#24020
Merged
Conversation
* Move macOS PBS pins into builder inputs * Update dependency resolution --------- Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com> (cherry picked from commit 08e8b31)
Contributor
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files🚀 New features to boost your workflow:
|
Contributor
Validation Report
Run Passed validations (19)
|
Contributor
|
Wheels promoted to stable storage for commit |
sarah-witt
approved these changes
Jun 11, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Backport of #24015 to
7.80.x. Moves the macOS Python Build Standalone (PBS) pins (PYTHON_PATCH,PBS_RELEASE,PBS_SHA256__aarch64,PBS_SHA256__x86_64) from the inlineenv:block in.github/workflows/resolve-build-deps.yamlinto a new.builders/images/macos/pbs.envfile, sourced by the workflow at runtime. Updatesddev meta scripts upgrade-python-version(and its tests) to write the new file.Motivation
The previous inline
env:lived outside.builders/, so it was not covered by the per-targetimages/<target>/**/*hash computed in.builders/inputs_hash.py. A PBS pin bump (e.g. 3.13.13 → 3.13.14) therefore did not invalidate the~/builder_rootcache on macOS, so the cached virtualenv kept pointing at the previously installed PBS Python. Co-locating the pins under.builders/images/macos/puts them inside the hash domain and makes the cache key flip on every bump.Manual backport because
dd-backport[bot]did not file one automatically. The cherry-pick was clean except for.deps/lockfile artifacts, which were resolved to the7.80.xversions; the dependency-resolution workflow regenerates them on this branch.Review checklist (to be filled by reviewers)
qa/skip-qalabel if the PR doesn't need to be tested during QA.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged