Skip to content

chore: migrate from vX.Y-dev branching model to single dev branch#778

Merged
xdustinface merged 2 commits into
devfrom
chore/migrate-to-dev-branch-model
May 20, 2026
Merged

chore: migrate from vX.Y-dev branching model to single dev branch#778
xdustinface merged 2 commits into
devfrom
chore/migrate-to-dev-branch-model

Conversation

@xdustinface

@xdustinface xdustinface commented May 20, 2026

Copy link
Copy Markdown
Collaborator

Switch the development model away from per-release vX.Y-dev branches (v0.40-dev, v0.41-dev, v0.42-dev, each going stale after its release) to a single permanent dev branch as the default for active development, with master renamed to main to track the latest tagged release. Release branches (chore/release-vX.Y.Z) are still cut from dev per release for the review window, then merged back.

Updates the file-level references that hardcode the old model:

  • CI workflow triggers (pre-commit, rust, sanitizer, conflict-check) now fire on pushes to main / dev instead of master / v**-dev.
  • CLAUDE.md, AGENTS.md, CONTRIBUTING.md, README.md describe the new branching model and target branches.
  • README codecov badges point at branch/main and branch/dev.

The actual GitHub-side actions (rename master -> main, rename v0.42-dev -> dev, change default branch, update branch-protection rules) are repo settings and must be performed by an admin separately. Order matters: tag v0.42.0 from v0.42-dev first, then perform the GitHub renames, then merge this PR against dev.

To fix it up locally just run:

git branch -m v0.42-dev dev
git fetch origin
git branch -u origin/dev dev
git remote set-head origin -a

Summary by CodeRabbit

Release Notes

  • Chores
    • Updated CI/CD workflows and documentation to reflect a new branching model: main for stable releases and hotfixes, dev for active feature development, replacing the previous master and versioned v*-dev branches.

Review Change Stack

Switch the development model away from per-release `vX.Y-dev` branches (`v0.40-dev`, `v0.41-dev`, `v0.42-dev`, each going stale after its release) to a single permanent `dev` branch as the default for active development, with `master` renamed to `main` to track the latest tagged release. Release branches (`chore/release-vX.Y.Z`) are still cut from `dev` per release for the review window, then merged back.

Updates the file-level references that hardcode the old model:

- CI workflow triggers (`pre-commit`, `rust`, `sanitizer`, `conflict-check`) now fire on pushes to `main` / `dev` instead of `master` / `v**-dev`.
- `CLAUDE.md`, `AGENTS.md`, `CONTRIBUTING.md`, `README.md` describe the new branching model and target branches.
- README codecov badges point at `branch/main` and `branch/dev`.

The actual GitHub-side actions (rename `master` -> `main`, rename `v0.42-dev` -> `dev`, change default branch, update branch-protection rules) are repo settings and must be performed by an admin separately. Order matters: tag `v0.42.0` from `v0.42-dev` first, then perform the GitHub renames, then merge this PR against `dev`.

To fix it up locally just run:

```
git branch -m v0.42-dev dev
git fetch origin
git branch -u origin/dev dev
git remote set-head origin -a
```
@coderabbitai

coderabbitai Bot commented May 20, 2026

Copy link
Copy Markdown
Contributor

Warning

Rate limit exceeded

@xdustinface has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 51 minutes and 4 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: f20d3356-cf52-4792-9825-63fbd83469d2

📥 Commits

Reviewing files that changed from the base of the PR and between 848f099 and a033173.

📒 Files selected for processing (1)
  • CONTRIBUTING.md
📝 Walkthrough

Walkthrough

This pull request updates the repository's Git branching convention from master/v**-dev to main/dev. GitHub Actions workflows are configured to trigger on the new branch names, and all contributor-facing and public documentation is revised to reflect the simplified branching model.

Changes

Branch Naming Convention Migration

Layer / File(s) Summary
GitHub workflow branch triggers
.github/workflows/conflict-check.yml, pre-commit.yml, rust.yml, sanitizer.yml
All four GitHub Actions workflows update their push.branches filter lists to target main and dev instead of master and v**-dev or v*-dev patterns. No other workflow logic or job behavior changes.
Contributor guidelines
AGENTS.md, CLAUDE.md, CONTRIBUTING.md
Documentation for contributors is updated to describe the new branching model: dev as the active development branch, main as the stable release-tracking branch, and chore/release-vX.Y.Z for short-lived release branches. Replaces prior versioned (v**-dev) and master references.
Public repository documentation
README.md
Coverage badge URLs and the Branching Model section are updated to reference main and dev branches instead of master and v0.42-dev.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Poem

🐰 From master's old reign to main we now spring,
Dev branches thrive where new features take wing,
Workflows aligned and docs freshly refed,
The garden of code hops to main and to dev! 🌿

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main objective—migrating from versioned dev branches to a single dev branch—and is specific, clear, and directly related to all changes in the pull request.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/migrate-to-dev-branch-model

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.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@CONTRIBUTING.md`:
- Line 70: Replace the hardcoded branch name in the heading string
"Prerequisites that a PR must satisfy for merging into the `main` branch:" with
a target-branch-agnostic phrase such as "Prerequisites that a PR must satisfy
for merging into the target branch:" so the guidance no longer assumes `main`;
update that exact line in CONTRIBUTING.md to use "target branch" (or similar
neutral wording) wherever the literal appears.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 97583ce1-c23c-4904-a1d9-5a32747e9bb0

📥 Commits

Reviewing files that changed from the base of the PR and between 4af39af and 848f099.

📒 Files selected for processing (8)
  • .github/workflows/conflict-check.yml
  • .github/workflows/pre-commit.yml
  • .github/workflows/rust.yml
  • .github/workflows/sanitizer.yml
  • AGENTS.md
  • CLAUDE.md
  • CONTRIBUTING.md
  • README.md

Comment thread CONTRIBUTING.md Outdated
@codecov

codecov Bot commented May 20, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.68%. Comparing base (4af39af) to head (a033173).

Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #778      +/-   ##
==========================================
- Coverage   72.69%   72.68%   -0.02%     
==========================================
  Files         321      321              
  Lines       70350    70350              
==========================================
- Hits        51140    51132       -8     
- Misses      19210    19218       +8     
Flag Coverage Δ
core 76.30% <ø> (ø)
ffi 49.15% <ø> (ø)
rpc 20.00% <ø> (ø)
spv 89.87% <ø> (-0.06%) ⬇️
wallet 71.27% <ø> (ø)
see 3 files with indirect coverage changes

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@github-actions github-actions Bot added the ready-for-review CodeRabbit has approved this PR label May 20, 2026
@xdustinface
xdustinface merged commit a4217d2 into dev May 20, 2026
35 checks passed
@xdustinface
xdustinface deleted the chore/migrate-to-dev-branch-model branch May 20, 2026 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-review CodeRabbit has approved this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant