Skip to content

Commit bcf5520

Browse files
authored
chore: rename proj. from master to main (#186)
1 parent 8571177 commit bcf5520

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/validate.yml

Lines changed: 3 additions & 3 deletions
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'
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
if:
5050
${{ github.repository == 'testing-library/cypress-testing-library' &&
51-
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha',
51+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
5252
github.ref) && github.event_name == 'push' }}
5353
steps:
5454
- name: 🛑 Cancel Previous Runs
@@ -79,7 +79,7 @@ jobs:
7979
branches: |
8080
[
8181
'+([0-9])?(.{+([0-9]),x}).x',
82-
'master',
82+
'main',
8383
'next',
8484
'next-major',
8585
{name: 'beta', prerelease: true},

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
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
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/kentcdodds/cypress-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

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

@@ -36,7 +36,7 @@ testing practices.</p>
3636
<img
3737
width="500"
3838
alt="TestingJavaScript.com Learn the smart, efficient way to test any JavaScript application."
39-
src="https://raw.githubusercontent.com/testing-library/cypress-testing-library/master/other/testingjavascript.jpg"
39+
src="https://raw.githubusercontent.com/testing-library/cypress-testing-library/main/other/testingjavascript.jpg"
4040
/>
4141
</a>
4242
</div>
@@ -119,7 +119,7 @@ commands.
119119
[See the `DOM Testing Library` docs for reference](https://testing-library.com)
120120

121121
You can find
122-
[all Library definitions here](https://github.com/testing-library/cypress-testing-library/tree/master/types/index.d.ts).
122+
[all Library definitions here](https://github.com/testing-library/cypress-testing-library/tree/main/types/index.d.ts).
123123

124124
To configure DOM Testing Library, use the following custom command:
125125

@@ -297,11 +297,11 @@ MIT
297297
[downloads-badge]: https://img.shields.io/npm/dm/@testing-library/cypress.svg?style=flat-square
298298
[npmtrends]: http://www.npmtrends.com/@testing-library/cypress
299299
[license-badge]: https://img.shields.io/npm/l/@testing-library/cypress.svg?style=flat-square
300-
[license]: https://github.com/testing-library/cypress-testing-library/blob/master/LICENSE
300+
[license]: https://github.com/testing-library/cypress-testing-library/blob/main/LICENSE
301301
[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
302302
[prs]: http://makeapullrequest.com
303303
[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
304-
[coc]: https://github.com/testing-library/cypress-testing-library/blob/master/other/CODE_OF_CONDUCT.md
304+
[coc]: https://github.com/testing-library/cypress-testing-library/blob/main/other/CODE_OF_CONDUCT.md
305305
[emojis]: https://allcontributors.org/docs/en/emoji-key
306306
[all-contributors]: https://github.com/all-contributors/all-contributors
307307
[all-contributors-badge]: https://img.shields.io/github/all-contributors/testing-library/cypress-testing-library?color=orange&style=flat-square

other/MAINTAINING.md

Lines changed: 1 addition & 1 deletion
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)