chore: move the development branch from dev to develop - #113
Merged
Conversation
One logical change across CI and the documentation, kept in one commit because splitting it would leave a state where the workflows enforce one branch name and the documents describe another. **Workflows.** `gitflow.yml` is the one that matters: it only triggers on PRs whose base is in `branches:`, and its two jobs are the required status checks on the rulesets. Left pointing at `dev`, a PR into `develop` would never run it, so the required check would never report and the PR would be unmergeable — blocked waiting on something that cannot arrive. Its trigger, both `base_ref` guards, the release head-branch check and every message now say `develop`. `test-and-build.yml` gets the push trigger and the `head_ref` gate that lets the macOS and Windows suites run on the release path. `deploy-landing.yml` gets its push trigger. `release.yml` only mentioned the old name in a comment. **The staging branch keeps its name.** `pages/landing-dev` is what serves the staging site, so renaming it would change that URL and buy nothing. The name describes the environment, not the branch the build came from, and both `deployment.md` and the workflow now say so rather than leaving it looking like something that was missed. **Documentation.** 41 references across `git_flow.md`, `deployment.md`, `architecture.md` and `README.md`. The rename was applied only to the backticked branch reference, so `pages/landing-dev`, the `collapse-server-aio:dev` image tag, `npm run tauri dev` and the word "development" were left alone; the ASCII flow diagram and a table's column alignment were fixed by hand afterwards. **Not in this commit, and required before `dev` is deleted:** the rulesets. `protect-dev` still targets `refs/heads/dev`. The documentation now calls it `protect-develop`, which is a promise this commit cannot keep on its own.
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.
Makes
developthe development branch everywhere, sodevcan be deletedwithout leaving the repository in a state where nothing can be merged.
The one that would have bitten
gitflow.ymlonly triggers on pull requests whose base is listed in itsbranches:filter, and its two jobs — gitflow branch name and releasesource branch — are the required status checks on the rulesets.
Left pointing at
dev, a pull request intodevelopwould never trigger it, sothe required check would never report, and the pull request would sit
unmergeable forever waiting on a job that cannot run. That is the failure mode
this PR exists to prevent, and it is silent: nothing errors, the check simply
never appears.
What changed
gitflow.yml— trigger, bothbase_refguards, the release head-branchcomparison, and every message a contributor would read.
test-and-build.yml— the push trigger, and thehead_refgate that putsthe macOS and Windows suites on the release path.
deploy-landing.yml— the push trigger.release.yml— a comment only.git_flow.md,deployment.md,architecture.mdandREADME.md.Two decisions worth reviewing
pages/landing-devkeeps its name. It is the branch that serves the stagingsite; renaming it would change that URL for no gain. The name describes the
environment rather than the branch the build came from, and both
deployment.mdanddeploy-landing.ymlnow say so, so it does not read as anoversight later.
The rename was applied narrowly, to the backticked branch reference only.
That deliberately spared
pages/landing-dev, thecollapse-server-aio:devimage tag,
npm run tauri devand every use of the word "development". TheASCII flow diagram in
deployment.mdand one table's column alignment felloutside that rule and were fixed by hand.
Still required before
devis deletedThe rulesets are not in this repository and this PR cannot change them.
protect-dev(id 20884968) still targetsrefs/heads/dev. It has to targetrefs/heads/develop, and be renamed toprotect-develop, which is what thedocumentation in this PR now calls it.
protect-mainrequires the release source branch check, which after thisPR only passes for a head branch named
develop.Order matters: repoint the rulesets first, confirm a pull request into
developruns both checks, and only then delete
dev.