Skip to content

[pull] master from DataDog:master#605

Merged
pull[bot] merged 4 commits into
ConnectionMaster:masterfrom
DataDog:master
Jun 17, 2026
Merged

[pull] master from DataDog:master#605
pull[bot] merged 4 commits into
ConnectionMaster:masterfrom
DataDog:master

Conversation

@pull

@pull pull Bot commented Jun 17, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Kyle-Neale and others added 4 commits June 17, 2026 14:32
* Pin cryptography<49 in host_dependencies.txt

cryptography 49.0.0 (released 2026-06-12) dropped its macosx_10_9_universal2
wheel and now only ships macosx_11_0_arm64 for macOS. The macos-x86_64 leg
of resolve-build-deps runs on macos-14-large (Intel x86_64), so pip can't
match the arm64-only wheel and falls back to building from sdist. The
brew-wipe step in the workflow removes pkg-config and OpenSSL, so the Rust
openssl-sys build script fails.

host_dependencies.txt is management-tooling-only (google-cloud-storage pulls
cryptography>=38.0.3 transitively); a pin here doesn't ship in any built
wheel and keeps the brew-wipe step intact.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Update dependency resolution

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>
…(Agent v7.80.0) (#23616)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
* Guard build_agent.yaml updates on Agent branch existence

Extract YAML helpers into a shared build_agent.py module so the inline
update in `ddev release branch create` and the recovery path through
the workflow share parsing logic. Gate both writers on the matching
DataDog/datadog-agent branch existing:

- `ensure_build_agent_yaml_updated` skips the rewrite (with a warning)
  when the upstream branch is missing, leaving `main` in place for the
  tag-time recovery path to handle later.
- The `update-build-agent-yaml.yml` workflow now hard-fails instead of
  warning when the upstream branch is missing, so a fire-and-forget
  dispatch from `ddev release branch tag` is visible in Actions.
- `bump_milestone` defensively restores build_agent.yaml from
  origin/master after checking out the milestone-bump branch so the
  release-branch edit cannot leak into the bump commit
  (see PR #23977 commit f71a89c).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Add changelog entry

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Wrap warning message to satisfy ruff E501

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Drop unused re-exports and __all__ from create.py

No external caller imports the two YAML-helper names from create.py;
they live in build_agent.py and tag.py imports them from there
directly. With those imports gone, __all__ has no purpose either.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Import build agent helper from owner module

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Bump PyJWT from 2.12.1 to 2.13.0

Fixes: VULN-86319, VULN-86320, VULN-86326, VULN-86329, VULN-86330
       (CVE-2026-48522, CVE-2026-48523, CVE-2026-48524, CVE-2026-48525, CVE-2026-48526)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Add changelog entry for PyJWT 2.13.0 bump

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Update dependency resolution

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>
@pull pull Bot locked and limited conversation to collaborators Jun 17, 2026
@pull pull Bot added the ⤵️ pull label Jun 17, 2026
@pull pull Bot merged commit efded0c into ConnectionMaster:master Jun 17, 2026
@pull pull Bot had a problem deploying to typo-squatting-release June 18, 2026 08:07 Failure
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants