Skip to content

Commit 128f095

Browse files
authored
chore: Rename branch master to main (testing-library#334)
1 parent 2892399 commit 128f095

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/validate.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- '+([0-9])?(.{+([0-9]),x}).x'
6-
- 'master'
6+
- 'main'
77
- 'next'
88
- 'next-major'
99
- 'beta'
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646
if:
4747
${{ github.repository == 'testing-library/jest-dom' &&
48-
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
48+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
4949
github.ref) && github.event_name == 'push' }}
5050
steps:
5151
- name: ⬇️ Checkout repo
@@ -71,7 +71,7 @@ jobs:
7171
branches: |
7272
[
7373
'+([0-9])?(.{+([0-9]),x}).x',
74-
'master',
74+
'main',
7575
'next',
7676
'next-major',
7777
{name: 'beta', prerelease: true},

CONTRIBUTING.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ series [How to Contribute to an Open Source Project on GitHub][egghead]
1111
2. Run `npm run setup -s` to install dependencies and run validation
1212
3. Create a branch for your PR with `git checkout -b pr/your-branch-name`
1313

14-
> Tip: Keep your `master` branch pointing at the original repository and make
15-
> pull requests from branches on your fork. To do this, run:
14+
> Tip: Keep your `main` branch pointing at the original repository and make pull
15+
> requests from branches on your fork. To do this, run:
1616
>
1717
> ```
1818
> git remote add upstream https://github.com/testing-library/jest-dom.git
1919
> git fetch upstream
20-
> git branch --set-upstream-to=upstream/master master
20+
> git branch --set-upstream-to=upstream/main main
2121
> ```
2222
>
2323
> This will add the original repository as a "remote" called "upstream," Then
24-
> fetch the git information from that remote, then set your local `master`
25-
> branch to use the upstream master branch whenever you run `git pull`. Then you
26-
> can make all of your pull request branches based on this `master` branch.
27-
> Whenever you want to update your version of `master`, do a regular `git pull`.
24+
> fetch the git information from that remote, then set your local `main` branch
25+
> to use the upstream main branch whenever you run `git pull`. Then you can make
26+
> all of your pull request branches based on this `main` branch. Whenever you
27+
> want to update your version of `main`, do a regular `git pull`.
2828
2929
## Committing and Pushing changes
3030

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
height="80"
77
width="80"
88
alt="owl"
9-
src="https://raw.githubusercontent.com/testing-library/jest-dom/master/other/owl.png"
9+
src="https://raw.githubusercontent.com/testing-library/jest-dom/main/other/owl.png"
1010
/>
1111
</a>
1212

@@ -1220,14 +1220,14 @@ MIT
12201220
[npmtrends]: http://www.npmtrends.com/@testing-library/jest-dom
12211221
[license-badge]:
12221222
https://img.shields.io/npm/l/@testing-library/jest-dom.svg?style=flat-square
1223-
[license]: https://github.com/testing-library/jest-dom/blob/master/LICENSE
1223+
[license]: https://github.com/testing-library/jest-dom/blob/main/LICENSE
12241224
[prs-badge]:
12251225
https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
12261226
[prs]: http://makeapullrequest.com
12271227
[coc-badge]:
12281228
https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
12291229
[coc]:
1230-
https://github.com/testing-library/jest-dom/blob/master/other/CODE_OF_CONDUCT.md
1230+
https://github.com/testing-library/jest-dom/blob/main/other/CODE_OF_CONDUCT.md
12311231
[github-watch-badge]:
12321232
https://img.shields.io/github/watchers/testing-library/jest-dom.svg?style=social
12331233
[github-watch]: https://github.com/testing-library/jest-dom/watchers

other/MAINTAINING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ to release. See the next section on Releases for more about that.
4848

4949
## Release
5050

51-
Our releases are automatic. They happen whenever code lands into `master`. A
51+
Our releases are automatic. They happen whenever code lands into `main`. A
5252
github action gets kicked off and if it's successful, a tool called
5353
[`semantic-release`](https://github.com/semantic-release/semantic-release) is
5454
used to automatically publish a new release to npm as well as a changelog to

0 commit comments

Comments
 (0)