fix(ci): auto-sync master uses --no-ff so releases don't break on branch divergence#3255
Merged
Conversation
…ergence The auto-sync did 'git merge --ff-only <develop>', which fails permanently once master diverges from develop — and it does whenever a develop->master promotion lands as a PR (a merge/squash commit on master that isn't on develop). That's exactly what stalled the tangle-cloud v0.0.4 release (auto-sync failed; the promotion had to be done by hand). A --no-ff merge always succeeds, is non-destructive (master keeps its commits, develop's release commits merge in), and still changes CHANGELOG.md so release-dapps deploys.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The
auto-sync-master-with-developworkflow rangit merge --ff-only <develop>onto master. That fails permanently oncemasterdiverges fromdevelop— which happens whenever a develop→master promotion lands as a PR (a merge/squash commit on master that isn't on develop). This is exactly what stalled the tangle-cloud v0.0.4 release: the[RELEASE]commit landed on develop, auto-sync failed on--ff-only, and the promotion had to be done by hand (PR #3254).Fix
Use
git merge --no-ff(with a message). It always succeeds, is non-destructive (master keeps its own commits; develop's release commits merge in), and still changesCHANGELOG.mdsorelease-dapps.ymldeploys. Future[RELEASE]pushes to develop will auto-sync to master without manual promotion.Note
Surfaced alongside a second pre-existing infra issue (separate fix, needs a secret rotation):
create-dapp-release'ssecrets.REPO_TOKENis expired — the release-tag step fails with "Bad credentials." That only tags a GitHub release (the CF Pages deploy is git-integration-driven), but it should be rotated.YAML-only change (outside the prettier/nx-lint globs); pushed through the pre-push hook.