Skip to content

ci(docker): isolate pre-merge image builds - #1695

Merged
FelixTJDietrich merged 2 commits into
mainfrom
ci/promote-merge-queue-images
Sep 1, 2026
Merged

ci(docker): isolate pre-merge image builds#1695
FelixTJDietrich merged 2 commits into
mainfrom
ci/promote-merge-queue-images

Conversation

@FelixTJDietrich

@FelixTJDietrich FelixTJDietrich commented Sep 1, 2026

Copy link
Copy Markdown
Collaborator

Description

Reduce duplicate container work without weakening the release boundary. Pull-request and merge-queue builds now publish amd64 images under candidate-only tags, while pushes to main continue to publish signed and attested amd64/arm64 images for the final commit. Sentry upload credentials are available only to main push builds.

GitHub creates a temporary integration candidate for a merge queue, and that candidate has its own SHA. Because Hephaestus records the source commit in each image, releases select images from the exact successful main workflow run and promote their verified digests without rebuilding. This avoids treating a temporary merge-group artifact as the final release artifact.

This changes repository CI and contributor documentation only, so no changeset, migration, or operator action is required.

How to test

  • Run pnpm run format.
  • Run pnpm run check.
  • Run pnpm run verify.
  • Confirm PR Docker jobs build only linux/amd64.
  • Confirm CI contract tests cover event-specific platforms and tags, Sentry credential scope, and exact release source-tag selection.
  • Confirm the complete hosted CI suite passes.

After merge, verify that the main workflow publishes amd64/arm64 indexes with signatures and attestations. On the next version release, verify that source resolution uses run-<run-id>-<attempt> and that promotion preserves the resolved digests.

Checklist

  • I did not commit generated-artifact changes that this PR did not cause.

@coderabbitai

coderabbitai Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

Next included review available in 28 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Team

Run ID: 02a797c7-d047-4d1a-a917-7f99f8b17fa0

📥 Commits

Reviewing files that changed from the base of the PR and between 4bb6c7e and 4e49e01.

📒 Files selected for processing (6)
  • .github/workflows/ci-docker-build.yml
  • .github/workflows/cicd.yml
  • .github/workflows/release.yml
  • .github/workflows/reusable-docker-build.yml
  • docs/contributor/ci-cd.mdx
  • scripts/ci-contract.test.ts

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Team

Run ID: ea2c4cc9-b3d8-48f1-a8e0-60afef90f45a

📥 Commits

Reviewing files that changed from the base of the PR and between 238d750 and 4bb6c7e.

📒 Files selected for processing (6)
  • .github/workflows/ci-docker-build.yml
  • .github/workflows/cicd.yml
  • .github/workflows/release.yml
  • .github/workflows/reusable-docker-build.yml
  • docs/contributor/ci-cd.mdx
  • scripts/ci-contract.test.ts

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.


📝 Walkthrough

Walkthrough

Docker CI now uses run-attempt image tags, merge-group single-architecture builds, and push-only Sentry secrets. Release validation resolves these tags and promotes image digests without rebuilding. Documentation and contract tests reflect the updated flow.

Changes

CI image promotion

Layer / File(s) Summary
Pre-merge image tagging and architecture
.github/workflows/ci-docker-build.yml, .github/workflows/reusable-docker-build.yml, scripts/ci-contract.test.ts
Docker builds add run-attempt tags, restrict branch and SHA tags to pushes, support merge-group single-architecture builds, and update unchanged-image tagging. Contract tests verify these rules.
Push-only Sentry secret forwarding
.github/workflows/cicd.yml, .github/workflows/reusable-docker-build.yml
Sentry secrets are forwarded only for push events.
Release digest resolution and promotion
.github/workflows/release.yml, docs/contributor/ci-cd.mdx, scripts/ci-contract.test.ts
Release validation resolves images through run-attempt tags. Documentation describes signed image locks, multi-architecture release images, provenance, and digest promotion without rebuilding. Contract tests verify the source-tag behavior.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Merge Risk: ⚪ Minimal · up to 4bb6c

The PR changes CI image build isolation and release promotion behavior, but no actionable merge-blocking correctness, security, availability, or readiness risk remains identified; it is merge-ready after normal checks and review.

Sequence Diagram(s)

sequenceDiagram
  participant DockerCI as Docker CI workflows
  participant Registry as OCI registry
  participant Release as Release workflow
  participant Environments as Staging and production
  DockerCI->>Registry: Publish run-attempt image tags
  Release->>Registry: Resolve image digests from SOURCE_TAG
  Release->>Environments: Promote verified OCI digests without rebuilding
Loading
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: isolating pre-merge Docker image builds.
Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1 files. (5 skipped: 5 unsupported.)

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch ci/promote-merge-queue-images

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added documentation Improvements or additions to documentation ci GitHub Actions, workflows, build pipeline changes size:M This PR changes 30-99 lines, ignoring generated files. labels Sep 1, 2026
@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

📚 Documentation Preview

Preview has been removed (PR closed)

@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

🧩 Storybook Preview

Preview has been removed (PR closed)

@FelixTJDietrich
FelixTJDietrich force-pushed the ci/promote-merge-queue-images branch from db7db21 to 06d8f3f Compare September 1, 2026 09:57
@github-actions github-actions Bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Sep 1, 2026
@FelixTJDietrich
FelixTJDietrich force-pushed the ci/promote-merge-queue-images branch from 06d8f3f to 4bb6c7e Compare September 1, 2026 09:59
@FelixTJDietrich FelixTJDietrich changed the title ci(docker): limit merge-group images to amd64 ci(docker): isolate pre-merge image builds Sep 1, 2026
github-actions[bot]
github-actions Bot previously approved these changes Sep 1, 2026

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

Approved automatically: @FelixTJDietrich is listed in the REVIEW_POLICY_MAINTAINERS repository variable, which the repository treats as satisfying the review requirement. See the review policy in docs/contributor/ci-cd.mdx.

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

Approved automatically: @FelixTJDietrich is listed in the REVIEW_POLICY_MAINTAINERS repository variable, which the repository treats as satisfying the review requirement. See the review policy in docs/contributor/ci-cd.mdx.

@FelixTJDietrich
FelixTJDietrich added this pull request to the merge queue Sep 1, 2026
Merged via the queue into main with commit 11a1b3c Sep 1, 2026
40 checks passed
@FelixTJDietrich
FelixTJDietrich deleted the ci/promote-merge-queue-images branch September 1, 2026 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci GitHub Actions, workflows, build pipeline changes documentation Improvements or additions to documentation size:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant