Skip to content

chore(release): merge tag v0.7.2 back into main - #2675

Merged
mitodrummer merged 7 commits into
mainfrom
chore/merge-back-0.7.2
Oct 28, 2026
Merged

mitodrummer merged 7 commits into
mainfrom
chore/merge-back-0.7.2

Conversation

@mitodrummer

Copy link
Copy Markdown
Member

Summary

Step 7 of the release runbook for 0.7.2: merge tag v0.7.2 back into main with git merge -s ours. The merge keeps the tree of main (it changes no files) and records only the history. With it, git describe, scripts/next-version.sh and the release notes on main count from v0.7.2 instead of v0.7.0.

v0.7.1 is an ancestor of v0.7.2, so this also links v0.7.1. #2474 meant to do that, but it was squash-merged, and a squash commit has no second parent, so v0.7.1 was never reachable from main.

Important

Merge this with "Create a merge commit". Squash or rebase drops the link to the tag, which is what happened to #2474. Merge commits are turned off in the repository settings (allow_merge_commit=false). The main ruleset allows them, so an admin has to turn the setting on, merge this PR, and turn it off again.

Branch commits not on main as identical patches

git cherry -v origin/main v0.7.2 lists three commits. Each is on main or does not need to be:

Release commit On main as
41f3ac89 rustls-webpki 0.103.16, webpki-root-certs 1.0.10 (#2466) #2466. main's Cargo.lock has the same versions.
0ca3bf42 bump version to 0.7.1 Not needed: main declares 0.8.0.
38f7cac7 hotfix 0.7.2 with the RUSTSEC bumps (#2630) #2627 (zstd), #2503 (ctutils), #2517 (crypto-bigint), #2326 (tokio). main's Cargo.lock has zstd 0.14.3, zstd-safe 8.2.0, zstd-sys 2.1.2, ctutils 0.4.5, crypto-bigint 0.7.7 and tokio 1.53.3, the same as the release.

#2638 and #2671 match #2637 and #2670 patch for patch, so git cherry does not list them.

Testing

  • git diff origin/main HEAD is empty.
  • git merge-base --is-ancestor passes for both v0.7.1 and v0.7.2.
  • git describe --tags --match 'v*': v0.7.0-232-g34bf60eb on main, v0.7.2-233-g37a24ef5 on this branch.
  • scripts/next-version.sh --check: package.version 0.8.0 satisfies the 230 commit(s) since v0.7.2 (minor bump, at least 0.8.0) and is greater than the newest tag v0.7.2.

🤖 Generated with Claude Code

https://claude.ai/code/session_016CYvTy9Jxczrnwgma36qEu

norrietaylor and others added 7 commits October 15, 2026 09:09
…its tag (#2220)

The publish job looked the release up with `gh release view v<semver>`.
A draft has no tag yet, so the lookup answered 404 for exactly the
release the job exists to publish, and the 0.7.0 promotion failed there.
Publishing a draft without naming tag_name also tags it with the draft's
untagged-<hex> placeholder rather than v<semver>.

The job now finds the release by listing releases and matching
tag_name, refuses when more than one carries the tag, and publishes by
id with tag_name and target_commitish set.
…dvisories (#2466)

RUSTSEC-2026-0382 (rustls-webpki 0.103.15) and RUSTSEC-2026-0383 (webpki-root-certs
1.0.9), both published 2026-10-20, red cargo-deny on every PR. rustls-webpki 0.103.16 rejects
paths through the distrusted emSign intermediates, and webpki-root-certs 1.0.10 drops the emSign
ECC Root CA - G3. Lockfile-only change.

(cherry picked from commit c0ac8c5)
Hotfix release carrying the rustls-webpki and webpki-root-certs bumps
from #2466 (RUSTSEC-2026-0382, RUSTSEC-2026-0383) onto 0.7.0.

Claude-Session: https://claude.ai/code/session_01FnY4WzhrnmSEByMntmqsVF
…-bigint, tokio) (#2630)

* build(deps): zstd 0.14.3, zstd-safe 8.2.0, zstd-sys 2.1.2, for RUSTSEC-2026-0391, -0398 and -0403 (#2627)

Claude-Session: https://claude.ai/code/session_01NSAwDroXL6KqsSxUzdbZGw

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 468a859)

* build(deps): ctutils 0.4.5, for RUSTSEC-2026-0385 (#2503)

* build(deps): ctutils 0.4.5, for RUSTSEC-2026-0385

A new advisory on ctutils 0.4.2 (non-constant-time mask generation and
u128 comparisons; a transitive dependency through p256, ecdsa,
elliptic-curve and crypto-bigint) fails cargo-deny on every pull request
since this morning, so nothing can merge until the lock moves. Patched in
0.4.4; the lock takes 0.4.5. cargo deny check advisories is clean again
and the workspace checks --locked.

* chore(ci): re-run the cla status

(cherry picked from commit c9114e1)

* build(deps): crypto-bigint 0.7.7, for RUSTSEC-2026-0387 (#2517)

(cherry picked from commit 20e25e4)

* build(deps): tokio 1.53.3, for RUSTSEC-2026-0386

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NSAwDroXL6KqsSxUzdbZGw

* fix(minimald): build AsyncFd with tokio's unsafe register

tokio 1.53.3 deprecates AsyncFd::new as unsound (tokio-rs/tokio#8587),
and clippy's -D warnings fails the build on it. Port main's fix from
#2326 to both call sites, the PTY master and the tap device.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NSAwDroXL6KqsSxUzdbZGw

* chore(release): bump version to 0.7.2

Hotfix release carrying the zstd, ctutils, crypto-bigint and tokio bumps
(RUSTSEC-2026-0385, -0386, -0387, -0391, -0398, -0403) onto 0.7.1.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NSAwDroXL6KqsSxUzdbZGw

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: bryan-minimal <bryan@minimal.dev>
Co-authored-by: Norrie Taylor <91171431+norrietaylor@users.noreply.github.com>
)

Moves the pkgs locked_commit from bd62e6e2 (2026-10-04) to bd1feab5
(pkgs main, 2026-10-26), the same pin as the main PR #2637, so 0.7.2
ships the current guest image. That image picks up the emSign ECC Root
CA - G3 distrust (CVE-2026-111943, pkgs#947), musl 1.2.6-r3
(CVE-2026-107891, pkgs#993), and OpenSSL 3.5.9, expat 2.9.0, nghttp2
1.70.0 and pcre2 10.49 (pkgs#933). The guest kernel moves from 6.12.111
to 6.12.114, and libkrun moves to 1.19.7 with libkrunfw 5.6.2.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d curl fixes (#2671)

Moves the pkgs locked_commit from bd1feab5 (2026-10-26) to fe10f54c
(pkgs main, 2026-10-27), the same pin as #2670 on main. The guest
rootfs this pin materializes picks up brotli-libs 1.2.1-r0
(CVE-2026-111497, a critical decoder buffer overflow that a malicious
git server reaches through libcurl) and libcurl 8.23.0-r0 with Alpine's
8.23.0 curl CVE fixes (pkgs#1109). The rest of the range is package
version bumps: grafana, patch, wrangler, stlink, redis, nats-server,
lerna, hunk and cloudflared.

(cherry picked from commit d9c9403)


Claude-Session: https://claude.ai/code/session_016CYvTy9Jxczrnwgma36qEu

Co-authored-by: Karl Godard <karl@minimal.dev>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016CYvTy9Jxczrnwgma36qEu
@minimal-foundry

minimal-foundry Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Approved: no findings at 37a24ef517f2.

Nothing to do.

Clobber: none, because no file changes.

@minimal-foundry minimal-foundry Bot 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.

minimal-review — approved

Verdict APPROVE — No findings.

Panel: 3 of 3 personas ran (correctness, security, supply-chain).

@minimal-foundry minimal-foundry Bot added the review:approved minimal-review approved the current head label Oct 28, 2026
@mitodrummer
mitodrummer merged commit 64717d9 into main Oct 28, 2026
35 of 36 checks passed
@mitodrummer
mitodrummer deleted the chore/merge-back-0.7.2 branch October 28, 2026 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review:approved minimal-review approved the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants