Skip to content

Commit 37d1cc4

Browse files
chore: rename master to main (#942)
Co-authored-by: Sebastian Silbermann <[email protected]>
1 parent d8a8d58 commit 37d1cc4

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'
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
if:
5454
${{ github.repository == 'testing-library/dom-testing-library' &&
55-
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
55+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
5656
github.ref) && github.event_name == 'push' }}
5757
steps:
5858
- name: 🛑 Cancel Previous Runs
@@ -81,7 +81,7 @@ jobs:
8181
branches: |
8282
[
8383
'+([0-9])?(.{+([0-9]),x}).x',
84-
'master',
84+
'main',
8585
'next',
8686
'next-major',
8787
{name: 'beta', prerelease: true},

CONTRIBUTING.md

+6-6
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` 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
14+
> Tip: Keep your `main` branch pointing at the original repository and make
1515
> pull requests from branches on your fork. To do this, run:
1616
>
1717
> ```
1818
> git remote add upstream https://github.com/testing-library/dom-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`
25+
> branch to use the upstream main branch whenever you run `git pull`. Then you
26+
> can make all of your pull request branches based on this `main` branch.
27+
> Whenever you want to update your version of `main`, do a regular `git pull`.
2828
2929
## Committing and Pushing changes
3030

README.md

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

@@ -41,7 +41,7 @@ practices.</p>
4141
<img
4242
width="500"
4343
alt="TestingJavaScript.com Learn the smart, efficient way to test any JavaScript application."
44-
src="https://raw.githubusercontent.com/testing-library/dom-testing-library/master/other/testingjavascript.jpg"
44+
src="https://raw.githubusercontent.com/testing-library/dom-testing-library/main/other/testingjavascript.jpg"
4545
/>
4646
</a>
4747
</div>
@@ -338,11 +338,11 @@ Contributions of any kind welcome!
338338
[downloads-badge]: https://img.shields.io/npm/dm/@testing-library/dom.svg?style=flat-square
339339
[npmtrends]: http://www.npmtrends.com/@testing-library/dom
340340
[license-badge]: https://img.shields.io/npm/l/@testing-library/dom.svg?style=flat-square
341-
[license]: https://github.com/testing-library/dom-testing-library/blob/master/LICENSE
341+
[license]: https://github.com/testing-library/dom-testing-library/blob/main/LICENSE
342342
[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
343343
[prs]: http://makeapullrequest.com
344344
[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
345-
[coc]: https://github.com/testing-library/dom-testing-library/blob/master/CODE_OF_CONDUCT.md
345+
[coc]: https://github.com/testing-library/dom-testing-library/blob/main/CODE_OF_CONDUCT.md
346346
[github-watch-badge]: https://img.shields.io/github/watchers/testing-library/dom-testing-library.svg?style=social
347347
[github-watch]: https://github.com/testing-library/dom-testing-library/watchers
348348
[github-star-badge]: https://img.shields.io/github/stars/testing-library/dom-testing-library.svg?style=social

other/MAINTAINING.md

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

6262
## Release
6363

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

0 commit comments

Comments
 (0)