Skip to content

Commit 824f784

Browse files
committed
Set branch references to main
1 parent d2a3a49 commit 824f784

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ def github_client
220220
end
221221
end
222222

223-
BASE_BRANCH = ENV.fetch('BRANCH', 'master')
224-
BASE_BRANCH_MAJOR_VERSION = if BASE_BRANCH == 'master'
223+
BASE_BRANCH = ENV.fetch('BRANCH', 'main')
224+
BASE_BRANCH_MAJOR_VERSION = if BASE_BRANCH == 'main'
225225
3
226226
else
227227
Integer(BASE_BRANCH[/^\d+/])

common_plaintext_files/CONTRIBUTING.md.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test case. To make this process easier, we have prepared one basic
3636

3737
Maintenance branches are how we manage the different supported point releases
3838
of RSpec. As such, while they might look like good candidates to merge into
39-
master, please do not open pull requests to merge them.
39+
main, please do not open pull requests to merge them.
4040

4141
## Working on multiple RSpec gems at the same time
4242

@@ -72,10 +72,10 @@ In general the process is:
7272
3. Check they pass (go green).
7373
4. Await review if appropriate.
7474
5. Remove the commit from one. We will merge ignoring the failure.
75-
6. Remove the commit from the other, check it passes with the other commit now on master.
75+
6. Remove the commit from the other, check it passes with the other commit now on main.
7676
7. Merge the other.
77-
8. Rebuild the other master to check it still passes.
77+
8. Rebuild the other main to check it still passes.
7878

7979
Steps 5-8 should happen contiguously (e.g. one after another but within a short timespan)
80-
so that we don't leave a broken master around. It is important to triage that build process
80+
so that we don't leave a broken main around. It is important to triage that build process
8181
and revert if necessary.

common_plaintext_files/DEVELOPMENT.md.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The rspec-dev project contains many rake tasks for helping manage
4646
an RSpec development environment, making it easy to do things like:
4747

4848
* Change branches across all repos
49-
* Update all repos with the latest code from `master`
49+
* Update all repos with the latest code from `main`
5050
* Cut a new release across all repos
5151
* Push out updated build scripts to all repos
5252

travis/appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: "{build}"
55
# and once for the merge commit that github creates for each mergable PR.
66
branches:
77
only:
8-
- master
8+
- main
99
- /.*-maintenance$/
1010

1111
# Disable normal Windows builds in favor of our test script.

0 commit comments

Comments
 (0)