From 1c87af560d25d0faee70af8406196b77c68c3b75 Mon Sep 17 00:00:00 2001 From: Jonathon Wright Date: Wed, 17 Jun 2026 23:33:34 +1000 Subject: [PATCH] ci(bump-digest): force-push the ephemeral deploy branch (idempotent re-runs) Re-running the same commit collided with the prior run's deploy/ branch (non-fast-forward reject). The branch is a disposable deploy artifact; main is the protected human-merge gate, so force-push is safe and makes re-runs work. --- scripts/bump-digest.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/bump-digest.sh b/scripts/bump-digest.sh index 8648a13..f3e0063 100755 --- a/scripts/bump-digest.sh +++ b/scripts/bump-digest.sh @@ -46,7 +46,11 @@ git --no-pager diff -- "${MANIFEST}" git config user.name "bztmon-site CI" git config user.email "ci@bztmon.com" git commit -am "bztmon-site: deploy ${TAG}" -git push origin "${BRANCH}" +# Force-push: the deploy branch name is deterministic (per-commit), so a RE-RUN of the same +# commit would otherwise hit a non-fast-forward reject ("fetch first") against the stale branch +# from the prior run. The branch is an ephemeral, disposable deploy artifact (main is the gate, +# protected, human-merged) → force is safe and makes re-runs idempotent. +git push --force origin "${BRANCH}" # --- PR (never auto-merge; BEST-EFFORT) ------------------------------------ # The branch push above IS the deploy artifact — the rollout is ready regardless of the PR.