Skip to content

fix(ci): merge digests after both arch image builds - #2366

Closed
shikanime wants to merge 6 commits into
mainfrom
fix/merge-digest-cross-arch-nginx-strangler-2364
Closed

fix(ci): merge digests after both arch image builds#2366
shikanime wants to merge 6 commits into
mainfrom
fix/merge-digest-cross-arch-nginx-strangler-2364

Conversation

@shikanime

@shikanime shikanime commented Jul 27, 2026

Copy link
Copy Markdown
Member

Related Issues

#2364

Problem

The release workflow currently lets each per-architecture build job push its own digest/merge path independently. That can leave separate arch-specific manifests in GHCR and inconsistent image state after release builds.

Fix

Keep the existing build-amd64 and build-arm64 splits, but add one final merge-manifests job that waits for both builds, downloads all pushed digests together, and runs docker buildx imagetools create once to produce a single merged manifest list with the expected release tags.

Notes

  • job-build.yml gets a new optional SKIP_MERGE input; per-arch builds set it to true.
  • The new merge job reuses the existing digest artifact naming and Docker metadata/tagging flow.
  • Default/PR/merge-queue workflows remain untouched here.

@shikanime
shikanime force-pushed the fix/merge-digest-cross-arch-nginx-strangler-2364 branch from 1c8bf48 to 85e0302 Compare July 27, 2026 07:26
@github-actions github-actions Bot added the built label Jul 27, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🤖 Hey !

The security scan report for the current pull request is available here.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Hey !

The security scan report for the current pull request is available here.

@shikanime
shikanime marked this pull request as draft July 27, 2026 08:47
@github-actions

Copy link
Copy Markdown
Contributor

🤖 Hey !

The security scan report for the current pull request is available here.

@cloud-pi-native-sonarqube

Copy link
Copy Markdown

@shikanime shikanime left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review: #2366 — fix(ci): merge digests after both arch image builds

Verdict: APPROVE (compliance review — GitHub blocks self-approval)

Scope

  • job-build.yml: +1 descriptive line on PR_NUMBER input (docs only).
  • workflow-create-or-update-release.yml: adds build-arm64 to a needs chain so the downstream digest-merge / chart-update step waits for both amd64 and arm64 builds.

Compliance checklist

  • Change matches PR title/intent (ordering fix, not logic change)
  • build-arm64 job already exists; only missing from this needs list
  • No behavioral risk: pure CI dependency ordering; no secret/env exposure
  • Conventional commit / title style OK
  • No test needed (workflow YAML)

No blocking issues. Safe to merge.

@StephaneTrebel
StephaneTrebel self-requested a review July 27, 2026 12:35
@shikanime shikanime closed this Jul 28, 2026
@shikanime
shikanime deleted the fix/merge-digest-cross-arch-nginx-strangler-2364 branch July 29, 2026 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants