Skip to content

chore: migrate to trunk-based branching model#41

Merged
josstei merged 1 commit into
mainfrom
chore/trunk-based-branching
Apr 14, 2026
Merged

chore: migrate to trunk-based branching model#41
josstei merged 1 commit into
mainfrom
chore/trunk-based-branching

Conversation

@josstei

@josstei josstei commented Apr 14, 2026

Copy link
Copy Markdown
Owner

Summary

  • Remove dev branch from all CI/CD workflow triggers and references
  • Remove back-merge step from release.yml (main → dev PR)
  • Remove auto-merge PR-to-dev step from prepare-release.yml
  • Rewrite docs/cicd.md to reflect trunk-based model (removes ~40 dev references)
  • Update justfile cleanup-branches reference

Implements the design from docs/superpowers/specs/2026-04-13-trunk-based-branching-design.md.

Test plan

  • CI passes on this PR (generator-check runs against main)
  • Verify no dev branch references remain in workflow files
  • Verify docs/cicd.md has no dev-as-branch references
  • After merge: manually delete dev branch and remove its protection rules

Remove dev branch from all CI/CD workflows. Main is now the sole
long-lived branch serving as both integration target and release source.

- generator-check: watch main only (was main + dev)
- nightly: build from main (was dev)
- prepare-release: run from main, remove PR-to-dev auto-merge step
- release: remove back-merge PR step (main to dev)
- justfile: update unmerged branch reference
- docs/cicd.md: full rewrite for trunk-based model
@josstei josstei merged commit 3493421 into main Apr 14, 2026
1 check passed
@josstei josstei deleted the chore/trunk-based-branching branch April 14, 2026 04:14
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