Skip to content

chore: migrate to GitHub Flow (main only) - #198

Merged
Destynova2 merged 1 commit into
mainfrom
chore/github-flow-migration
Apr 14, 2026
Merged

chore: migrate to GitHub Flow (main only)#198
Destynova2 merged 1 commit into
mainfrom
chore/github-flow-migration

Conversation

@Destynova2

Copy link
Copy Markdown
Contributor

Summary

Migrate from Git Flow (develop+main) to GitHub Flow (main only).

Deleted:

  • sync-main.yml — no longer needed, no develop→main sync
  • All references to develop in 8 workflow files

Modified:

  • release-plz.yml → targets main instead of develop
  • ci.yml → triggers on main push/PR
  • cleanup-branches.yml → protects main only
  • nightly.yml, codeql.yml, semgrep.yml, ci-docs-shim.ymlmain
  • CLAUDE.md → updated branching model docs

After merge:

  1. Change default branch to main on GitHub (already is)
  2. Migrate ruleset "Protect develop" → "Protect main"
  3. Delete the develop branch
  4. Remove workflow scope: gh auth refresh

Why

The develop+main model caused:

  • 79 commits drift
  • 27 orphan branches from sync/release/absorb
  • release-plz CHANGELOG conflicts on every release
  • 5 workflows just for the release chain

@Destynova2
Destynova2 enabled auto-merge (squash) April 14, 2026 19:18
The develop+main model added friction without proportional value:
- 5 workflows just for the release chain
- sync-main conflicts on every release
- 79 commits drift between develop and main
- 27 orphan branches from sync/release/absorb

GitHub Flow (main only) eliminates:
- sync-main.yml (deleted)
- absorb job (no longer needed)
- develop branch (will be deleted after merge)
- All sync-main-v* and absorb-main-* branches
- CHANGELOG.md conflicts between develop and main

What changes:
- release-plz now targets main instead of develop
- CI triggers on main push/PR instead of develop
- Feature branches → PR → main (direct)
- release-plz PR → auto-merge → tag → release pipeline
- cleanup-branches protects main only
- nightly runs on main
- CLAUDE.md branching model updated
@Destynova2
Destynova2 force-pushed the chore/github-flow-migration branch from afa64e4 to 8f7d051 Compare April 14, 2026 19:49
@Destynova2
Destynova2 merged commit 773f591 into main Apr 14, 2026
43 checks passed
@Destynova2
Destynova2 deleted the chore/github-flow-migration branch April 14, 2026 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant