Skip to content

Move macOS PBS pins into builder inputs#24015

Merged
Kyle-Neale merged 2 commits into
masterfrom
kyle.neale/macos-pbs-env
Jun 11, 2026
Merged

Move macOS PBS pins into builder inputs#24015
Kyle-Neale merged 2 commits into
masterfrom
kyle.neale/macos-pbs-env

Conversation

@Kyle-Neale

@Kyle-Neale Kyle-Neale commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

Move macOS PBS pins to .builders/images/macos/pbs.env and source them in resolve-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)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Add qa/required if this PR needs QA validation, or qa/skip-qa if it does not. Exactly one of the two is required.
  • If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

@Kyle-Neale Kyle-Neale added the qa/skip-qa Automatically skip this PR for the next QA label Jun 11, 2026 — with ChatGPT Codex Connector
@Kyle-Neale Kyle-Neale changed the base branch from bot/upgrade-python-version-1781179139 to master June 11, 2026 13:49
@Kyle-Neale Kyle-Neale force-pushed the kyle.neale/macos-pbs-env branch from 7bbf301 to be3edcb Compare June 11, 2026 13:56
@datadog-prod-us1-5

This comment has been minimized.

Copilot AI 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.

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.env to store macOS PBS pins (patch, release tag, per-arch SHA256).
  • Updated resolve-build-deps.yaml to source pbs.env (after checkout) instead of hardcoding pins in workflow env.
  • Updated the upgrade_python meta script and its tests to read/update the new pbs.env location.

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.

Comment thread .github/workflows/resolve-build-deps.yaml
iliakur
iliakur previously approved these changes Jun 11, 2026

@iliakur iliakur 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.

Don't forget to promote the wheels after the dependency resolution is done!

@temporal-github-worker-1 temporal-github-worker-1 Bot dismissed iliakur’s stale review June 11, 2026 14:50

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
@github-actions

github-actions Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Wheels promoted to stable storage for commit 6baf6787c49a6e2cb184ebb594b5fe9193f63e14 by @Kyle-Neale.
Workflow run: https://github.com/DataDog/integrations-core/actions/runs/27357594620

@Kyle-Neale Kyle-Neale enabled auto-merge June 11, 2026 15:32
@Kyle-Neale Kyle-Neale disabled auto-merge June 11, 2026 15:33
@Kyle-Neale Kyle-Neale merged commit 08e8b31 into master Jun 11, 2026
401 of 407 checks passed
@Kyle-Neale Kyle-Neale deleted the kyle.neale/macos-pbs-env branch June 11, 2026 15:33
@dd-octo-sts dd-octo-sts Bot added this to the 7.81.0 milestone Jun 11, 2026
@dd-octo-sts

dd-octo-sts Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

The backport to 7.81.x failed:

The process '/usr/bin/git' failed with exit code 1

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.x

Then, create a pull request where the base branch is 7.81.x and the compare/head branch is backport-24015-to-7.81.x.

@dd-octo-sts

dd-octo-sts Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

The backport to 7.80.x failed:

The process '/usr/bin/git' failed with exit code 1

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.x

Then, create a pull request where the base branch is 7.80.x and the compare/head branch is backport-24015-to-7.80.x.

github-actions Bot pushed a commit that referenced this pull request Jun 11, 2026
* 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
@dd-octo-sts

dd-octo-sts Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Validation Report

All 21 validations passed.

Show details
Validation Description Status
agent-reqs Verify check versions match the Agent requirements file
ci Validate CI configuration and code coverage settings
codeowners Validate every integration has a CODEOWNERS entry
config Validate default configuration files against spec.yaml
dep Verify dependency pins are consistent and Agent-compatible
http Validate integrations use the HTTP wrapper correctly
imports Validate check imports do not use deprecated modules
integration-style Validate check code style conventions
jmx-metrics Validate JMX metrics definition files and config
labeler Validate PR labeler config matches integration directories
legacy-signature Validate no integration uses the legacy Agent check signature
license-headers Validate Python files have proper license headers
licenses Validate third-party license attribution list
metadata Validate metadata.csv metric definitions
models Validate configuration data models match spec.yaml
openmetrics Validate OpenMetrics integrations disable the metric limit
package Validate Python package metadata and naming
qa-label Validate the pull request declares whether it needs QA for the next Agent release
readmes Validate README files have required sections
saved-views Validate saved view JSON file structure and fields
version Validate version consistency between package and changelog

View full run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants