Skip to content

ci: keep main forwarded to active dev branch#348

Merged
MuncleUscles merged 1 commit into
v0.40-devfrom
codex/main-dev-branch-policy
Jun 10, 2026
Merged

ci: keep main forwarded to active dev branch#348
MuncleUscles merged 1 commit into
v0.40-devfrom
codex/main-dev-branch-policy

Conversation

@MuncleUscles

@MuncleUscles MuncleUscles commented Jun 10, 2026

Copy link
Copy Markdown
Member

Description

This updates the repo to use main as the static/default branch while keeping the active development branch as the real integration target. PRs opened against main are retargeted to the active dev branch, and pushes to the active dev branch fast-forward main.

Details

  • active dev branch: v0.40-dev
  • adds support/ci/ACTIVE_DEV_BRANCH as the repo-local source of truth
  • adds retarget-main-prs.yaml for PRs opened against main
  • adds fast-forward-main.yaml to move main forward from v0.40-dev
  • adds branch-policy validation so the intended model is visible in CI

Validation

  • bash -n .github/scripts/validate-branch-policy.sh
  • local branch-policy script run
  • yq parse for branch-policy/retarget/fast-forward workflows
  • actionlint for branch-policy/retarget/fast-forward workflows

@coderabbitai

coderabbitai Bot commented Jun 10, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 88dbfc8a-8a17-4366-8a77-c3d2eff6d0f8

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/main-dev-branch-policy

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@MuncleUscles MuncleUscles merged commit 2100255 into v0.40-dev Jun 10, 2026
9 of 10 checks passed
@MuncleUscles MuncleUscles deleted the codex/main-dev-branch-policy branch June 10, 2026 14:46
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