Skip to content

Commit fe16376

Browse files
MatanBobieps1lon
andauthored
chore: rename master to main in all references (#901)
Co-authored-by: Sebastian Silbermann <[email protected]>
1 parent 7c84fa3 commit fe16376

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
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'
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-latest
5454
if:
5555
${{ github.repository == 'testing-library/react-testing-library' &&
56-
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
56+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
5757
github.ref) && github.event_name == 'push' }}
5858
steps:
5959
- name: 🛑 Cancel Previous Runs
@@ -82,7 +82,7 @@ jobs:
8282
branches: |
8383
[
8484
'+([0-9])?(.{+([0-9]),x}).x',
85-
'master',
85+
'main',
8686
'next',
8787
'next-major',
8888
{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/react-testing-library.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

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

@@ -44,7 +44,7 @@ practices.</p>
4444
<img
4545
width="500"
4646
alt="TestingJavaScript.com Learn the smart, efficient way to test any JavaScript application."
47-
src="https://raw.githubusercontent.com/testing-library/react-testing-library/master/other/testingjavascript.jpg"
47+
src="https://raw.githubusercontent.com/testing-library/react-testing-library/main/other/testingjavascript.jpg"
4848
/>
4949
</a>
5050
</div>
@@ -362,9 +362,9 @@ You'll find runnable examples of testing with different libraries in
362362
[the `react-testing-library-examples` codesandbox](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples).
363363
Some included are:
364364
365-
- [`react-redux`](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples/tree/master/?fontsize=14&module=%2Fsrc%2F__tests__%2Freact-redux.js&previewwindow=tests)
366-
- [`react-router`](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples/tree/master/?fontsize=14&module=%2Fsrc%2F__tests__%2Freact-router.js&previewwindow=tests)
367-
- [`react-context`](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples/tree/master/?fontsize=14&module=%2Fsrc%2F__tests__%2Freact-context.js&previewwindow=tests)
365+
- [`react-redux`](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples/tree/main/?fontsize=14&module=%2Fsrc%2F__tests__%2Freact-redux.js&previewwindow=tests)
366+
- [`react-router`](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples/tree/main/?fontsize=14&module=%2Fsrc%2F__tests__%2Freact-router.js&previewwindow=tests)
367+
- [`react-context`](https://codesandbox.io/s/github/kentcdodds/react-testing-library-examples/tree/main/?fontsize=14&module=%2Fsrc%2F__tests__%2Freact-context.js&previewwindow=tests)
368368
369369
You can also find React Testing Library examples at
370370
[react-testing-examples.com](https://react-testing-examples.com/jest-rtl/).
@@ -636,11 +636,11 @@ Contributions of any kind welcome!
636636
[downloads-badge]: https://img.shields.io/npm/dm/@testing-library/react.svg?style=flat-square
637637
[npmtrends]: http://www.npmtrends.com/@testing-library/react
638638
[license-badge]: https://img.shields.io/npm/l/@testing-library/react.svg?style=flat-square
639-
[license]: https://github.com/testing-library/react-testing-library/blob/master/LICENSE
639+
[license]: https://github.com/testing-library/react-testing-library/blob/main/LICENSE
640640
[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
641641
[prs]: http://makeapullrequest.com
642642
[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
643-
[coc]: https://github.com/testing-library/react-testing-library/blob/master/CODE_OF_CONDUCT.md
643+
[coc]: https://github.com/testing-library/react-testing-library/blob/main/CODE_OF_CONDUCT.md
644644
[github-watch-badge]: https://img.shields.io/github/watchers/testing-library/react-testing-library.svg?style=social
645645
[github-watch]: https://github.com/testing-library/react-testing-library/watchers
646646
[github-star-badge]: https://img.shields.io/github/stars/testing-library/react-testing-library.svg?style=social

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)