Skip to content

Commit f5d3445

Browse files
justin808claude
andcommitted
Update all master branch references to main (#2676)
Closes #2659 The default branch was renamed from `master` to `main` on GitHub. This PR updates all code references to match. - **CI workflows**: All 15 workflow files updated — branch triggers, `BASE_REF`/`BASE_SHA` fallbacks, `refs/heads/` conditions, and comments - **GitHub Action**: Renamed `ensure-master-docs-safety` → `ensure-main-docs-safety` (directory + content) - **Documentation**: ~50 files with GitHub URLs updated from `/blob/master/` and `/tree/master/` to `/main/` - **Config files**: Coveralls badge URLs, package.json homepage, rakelib comments, CLAUDE.md/AGENTS.md references - [ ] CI workflows trigger correctly on pushes to `main` - [ ] `detect-changes` fallback uses `origin/main` correctly - [ ] `ensure-main-docs-safety` action runs on docs-only pushes - [ ] Benchmark workflow references `main` for Bencher branch tracking - [ ] Documentation links resolve correctly 🤖 Generated with [Claude Code](https://claude.com/claude-code) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Medium risk because it touches many GitHub Actions workflows and CI guard logic; a missed branch/ref update could cause workflows not to trigger or docs-only pushes to incorrectly skip CI. > > **Overview** > Updates the repo-wide default-branch assumption from `master` to `main`, including documentation links/badges, contributor guidance, and changelog compare URLs. > > Adjusts CI to run against `main`: workflow push triggers and `refs/heads/*` conditions are switched, docs-only safeguards now use a renamed `ensure-main-docs-safety` composite action, and tooling defaults/fallbacks (e.g., `script/ci-changes-detector`, `bin/ci-local`, actionlint base ref) now compare against `origin/main`. > > Updates release/changelog automation to treat `main` as the required stable release branch and to generate compare links targeting `...main` (with specs updated accordingly). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 1514d64. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> * **Chores** * Switched default branch references from "master" to "main" across CI/workflows, scripts, tooling, and release checks so triggers and defaults target main. * **Documentation** * Updated links, examples, badges, guides, and contributor/release instructions to reference the main branch throughout docs and READMEs. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fc4a11e commit f5d3445

79 files changed

Lines changed: 291 additions & 580 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/agents/pr-testing-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description: Validates PR testing before merge. Use when creating PRs, investiga
1414
When you need more details, use the Read tool to examine:
1515

1616
- `.claude/docs/testing-build-scripts.md` - Build/package testing requirements
17-
- `.claude/docs/master-health-monitoring.md` - Post-merge CI monitoring
17+
- `.claude/docs/main-health-monitoring.md` - Post-merge CI monitoring
1818
- `SWITCHING_CI_CONFIGS.md` - CI config switching guide
1919
- `react_on_rails/spec/dummy/TESTING_LOCALLY.md` - Environment-specific testing issues
2020

.claude/docs/analysis/INDEX.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Outside the analysis directory:
108108
- **Main Migration Plan**: `/docs/MONOREPO_MERGER_PLAN.md` (authoritative source)
109109
- **Path Management Guide**: `/.claude/docs/managing-file-paths.md` (validation procedures)
110110
- **Build Script Testing**: `/.claude/docs/testing-build-scripts.md` (artifact verification)
111-
- **CI Monitoring**: `/.claude/docs/master-health-monitoring.md` (CI status checks)
111+
- **CI Monitoring**: `/.claude/docs/main-health-monitoring.md` (CI status checks)
112112
- **Contributing Guide**: `/CONTRIBUTING.md` (developer instructions)
113113

114114
---
@@ -195,7 +195,7 @@ Outside this analysis directory:
195195
- **Main Migration Plan**: `/docs/MONOREPO_MERGER_PLAN.md` (authoritative source)
196196
- **Path Management Guide**: `/managing-file-paths.md` (validation procedures)
197197
- **Build Script Testing**: `/testing-build-scripts.md` (artifact verification)
198-
- **CI Monitoring**: `/master-health-monitoring.md` (CI status checks)
198+
- **CI Monitoring**: `/main-health-monitoring.md` (CI status checks)
199199
- **Contributing Guide**: `/CONTRIBUTING.md` (developer instructions)
200200

201201
## Workflow Tips

.claude/docs/analysis/MONOREPO_MIGRATION_ANALYSIS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ task node_package: "node_package:build"
240240
```
241241
.conductor/surabaya-v1/.claude/docs/
242242
├── testing-build-scripts.md # Critical for path verification
243-
├── master-health-monitoring.md # CI status checks
243+
├── main-health-monitoring.md # CI status checks
244244
├── managing-file-paths.md # Path validation after refactors
245245
└── analysis/ # Analysis documents
246246
```

.claude/docs/analysis/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ These documents serve as:
2626
The analysis in these files led to the creation of:
2727

2828
- `.claude/docs/testing-build-scripts.md`
29-
- `.claude/docs/master-health-monitoring.md`
29+
- `.claude/docs/main-health-monitoring.md`
3030
- `.claude/docs/managing-file-paths.md`
3131

3232
See also PR #2062 and PR #2065 for the full context.

.claude/docs/avoiding-ci-failure-cycles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ bin/ci-rerun-failures
216216

217217
**IMPORTANT: Poll every 30 seconds, NOT 180 seconds.** CI jobs typically complete in 3-15 minutes, so 30-second polling gives responsive feedback.
218218

219-
**See**: [master-health-monitoring.md](master-health-monitoring.md)
219+
**See**: [main-health-monitoring.md](main-health-monitoring.md)
220220

221221
## Red Flags: When to STOP and Test More
222222

@@ -400,7 +400,7 @@ If the answer is **YES**, spend the 15 minutes.
400400
## Related Documentation
401401

402402
- [testing-build-scripts.md](testing-build-scripts.md) - Build script testing requirements
403-
- [master-health-monitoring.md](master-health-monitoring.md) - Post-merge monitoring
403+
- [main-health-monitoring.md](main-health-monitoring.md) - Post-merge monitoring
404404
- [pr-testing-agent.md](pr-testing-agent.md) - Comprehensive PR testing guide
405405
- [CLAUDE.md](../../CLAUDE.md) - Full development guide
406406
- [SWITCHING_CI_CONFIGS.md](../../SWITCHING_CI_CONFIGS.md) - Testing minimum vs latest

.claude/docs/master-health-monitoring.md

Lines changed: 0 additions & 89 deletions
This file was deleted.

.claude/docs/pr-testing-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,4 +689,4 @@ gh pr view --json statusCheckRollup
689689
- CI debugging: [CLAUDE.md](../../CLAUDE.md) "Replicating CI Failures Locally"
690690
- Config switching: [SWITCHING_CI_CONFIGS.md](../../SWITCHING_CI_CONFIGS.md)
691691
- Local testing issues: [react_on_rails/spec/dummy/TESTING_LOCALLY.md](../../react_on_rails/spec/dummy/TESTING_LOCALLY.md)
692-
- Master health: [master-health-monitoring.md](master-health-monitoring.md)
692+
- Main health: [main-health-monitoring.md](main-health-monitoring.md)

.github/actions/ensure-master-docs-safety/action.yml

Lines changed: 0 additions & 204 deletions
This file was deleted.

.github/read-me.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ By default, PRs run a subset of CI jobs to provide fast feedback:
3535
- Skips example generator tests
3636
- Skips some Pro package tests
3737

38-
This is intentional to keep PR feedback loops fast. However, before merging, you should verify compatibility across all supported versions. The `/run-skipped-ci` (or `/run-skipped-tests`) command makes this easy without waiting for the PR to be merged to master.
38+
This is intentional to keep PR feedback loops fast. However, before merging, you should verify compatibility across all supported versions. The `/run-skipped-ci` (or `/run-skipped-tests`) command makes this easy without waiting for the PR to be merged to main.
3939

4040
### Security & Access Control
4141

@@ -53,13 +53,13 @@ Multiple `/run-skipped-ci` or `/run-skipped-tests` comments on the same PR will
5353

5454
## Testing Comment-Triggered Workflows
5555

56-
**Important**: Comment-triggered workflows (`issue_comment` event) only execute from the **default branch** (master). This creates a chicken-and-egg problem when developing workflow changes.
56+
**Important**: Comment-triggered workflows (`issue_comment` event) only execute from the **default branch** (main). This creates a chicken-and-egg problem when developing workflow changes.
5757

5858
### Recommended Testing Approach
5959

6060
1. **Develop the workflow**: Create/modify the workflow in your feature branch
6161
2. **Test locally**: Validate YAML syntax and logic as much as possible
62-
3. **Merge to master**: The workflow must be in master to be triggered by comments
62+
3. **Merge to main**: The workflow must be in main to be triggered by comments
6363
4. **Test on a PR**: Create a test PR and use the comment command to verify
6464

6565
### Why This Limitation Exists
@@ -109,7 +109,7 @@ Most workflows use minimal permissions. The comment-triggered workflows require:
109109

110110
Many workflows use change detection to skip unnecessary jobs:
111111

112-
- Runs all jobs on pushes to `master`
112+
- Runs all jobs on pushes to `main`
113113
- Runs only relevant jobs on PRs based on changed files
114114
- Can be overridden with `workflow_dispatch` or `/run-skipped-ci` (or `/run-skipped-tests`) command
115115

0 commit comments

Comments
 (0)