Move macOS PBS pins into builder inputs#24015
Conversation
7bbf301 to
be3edcb
Compare
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Pull request overview
Moves the macOS Python Build Standalone (PBS) pinning data out of the GitHub Actions workflow and into builder inputs so that PBS bumps affect the per-target input hash and reliably invalidate the macOS ~/builder_root cache.
Changes:
- Added
.builders/images/macos/pbs.envto store macOS PBS pins (patch, release tag, per-arch SHA256). - Updated
resolve-build-deps.yamltosourcepbs.env(after checkout) instead of hardcoding pins in workflowenv. - Updated the
upgrade_pythonmeta script and its tests to read/update the newpbs.envlocation.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
ddev/tests/cli/meta/scripts/test_upgrade_python.py |
Updates assertions and error expectations to validate macOS PBS updates via pbs.env. |
ddev/tests/cli/meta/scripts/conftest.py |
Adjusts test repo fixture to include a macOS pbs.env fixture and keeps a minimal workflow stub. |
ddev/src/ddev/cli/meta/scripts/upgrade_python.py |
Switches macOS upgrade logic from editing the workflow YAML to editing .builders/images/macos/pbs.env. |
.github/workflows/upgrade-python-version.yml |
Updates workflow text to reference the new macOS PBS pins location. |
.github/workflows/resolve-build-deps.yaml |
Sources .builders/images/macos/pbs.env for macOS PBS pins and moves checkout earlier to make the file available. |
.builders/images/macos/pbs.env |
New file containing the pinned macOS PBS release/patch and SHA256s. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
iliakur
left a comment
There was a problem hiding this comment.
Don't forget to promote the wheels after the dependency resolution is done!
Review from iliakur is dismissed. Related teams and files:
- agent-integrations
- .deps/builder_inputs.toml
- .deps/resolved/linux-aarch64_3.13.txt
- .deps/resolved/linux-x86_64_3.13.txt
- .deps/resolved/macos-aarch64_3.13.txt
- .deps/resolved/macos-x86_64_3.13.txt
- .deps/resolved/windows-x86_64_3.13.txt
|
Wheels promoted to stable storage for commit |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.81.x 7.81.x
# Navigate to the new working tree
cd .worktrees/backport-7.81.x
# Create a new branch
git switch --create backport-24015-to-7.81.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 08e8b315a5a41c0c5b97aa4b84dce42c3915314b
# Push it to GitHub
git push --set-upstream origin backport-24015-to-7.81.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.81.xThen, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.80.x 7.80.x
# Navigate to the new working tree
cd .worktrees/backport-7.80.x
# Create a new branch
git switch --create backport-24015-to-7.80.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 08e8b315a5a41c0c5b97aa4b84dce42c3915314b
# Push it to GitHub
git push --set-upstream origin backport-24015-to-7.80.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.80.xThen, create a pull request where the |
* 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> 08e8b31
Validation ReportAll 21 validations passed. Show details
|
What does this PR do?
Move macOS PBS pins to
.builders/images/macos/pbs.envand source them inresolve-build-deps.Motivation
PBS pin bumps should affect builder input hashes and refresh the macOS builder-root cache.
Review checklist (to be filled by reviewers)
qa/requiredif this PR needs QA validation, orqa/skip-qaif it does not. Exactly one of the two is required.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged