chore(ci): move to trunk-based flow, drop develop branch - #13
Merged
Conversation
GitFlow's develop+main split serves projects maintaining multiple parallel versions (a library patching v1.x while developing v2.x). This is a continuously-deployed website — that split bought nothing and cost real time this session: three separate incidents (a manual version hotfix desyncing the two branches' semantic-release lineages, two develop push-races against its own CI auto-commit, and a main/develop merge conflict) all traced directly back to running two independently-versioned branches. - .releaserc.json: branches -> ["main"] only, drop develop's prerelease channel. - ci.yml: drop the push-to-develop trigger, PR-into-main only. - deploy.yml: drop the develop push trigger, the prerelease semantic-release step, and the fixed betteraborlan-dev.vercel.app alias re-point. Keeps only the PR-into-main preview + comment path, which already covered what the fixed alias was for. - release.yml: unchanged, already main-only. - README/CONTRIBUTING: rewritten branching sections for the trunk-based flow (branch off main, PR into main, protected). - PULL_REQUEST_TEMPLATE.md: dropped the 'targets develop' checklist item. - docs/facebook-sync.md: updated the disabled feature's revival notes — main is now the only branch and it's protected, so a bot token can't push straight to it either; needs a PR instead. develop branch itself deleted separately after this merges.
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
|
Preview deployed: https://betteraborlan-bcegypfea-jdbhomecillo-projects.vercel.app |
Contributor
Author
|
🎉 This PR is included in version 1.2.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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
1 participant
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.
GitFlow's develop+main split serves projects maintaining multiple parallel versions. This is a continuously-deployed website — the split bought nothing and caused three separate incidents this session (version-lineage desync, two develop push-races, a main/develop merge conflict).
.releaserc.json: branches -> ["main"] onlyci.yml: PR-into-main trigger onlydeploy.yml: dropped the develop push trigger, prerelease step, and fixed dev alias re-point — keeps only PR-into-main preview + commentrelease.yml: unchanged, already main-onlydocs/facebook-sync.md: updated revival notes (main is now protected, no direct push even for a bot token)developbranch deleted separately once this merges.🤖 Generated with Claude Code