jwright/bztmon-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci(bump-digest): force-push the ephemeral deploy branch (idempotent re-runs)

Browse Source 
Re-running the same commit collided with the prior run's deploy/<sha> 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.
This commit is contained in:
Jonathon Wright
2026-06-17 23:33:34 +10:00
parent 2592b5680b
commit 1c87af560d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/bump-digest.sh
+5 -1
View File
@@ -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.