Skip to content

Commit 651cbc4

Browse files
authored
chore: rename default branch to main (#42)
1 parent d6fdcfa commit 651cbc4

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
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'
@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
if:
5050
${{ github.repository == 'testing-library/preact-testing-library' &&
51-
contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha', github.ref) &&
51+
contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha', github.ref) &&
5252
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

+5-6
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@ 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 pull requests from
14+
> Tip: Keep your `main` branch pointing at the original repository and make pull requests from
1515
> branches on your fork. To do this, run:
1616
>
1717
> ```
1818
> git remote add upstream https://github.com/testing-library/preact-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 fetch the git
24-
> information from that remote, then set your local `master` branch to use the upstream master
25-
> branch whenever you run `git pull`. Then you can make all of your pull request branches based on
26-
> this `master` branch. Whenever you want to update your version of `master`, do a regular
27-
> `git pull`.
24+
> information from that remote, then set your local `main` branch to use the upstream main branch
25+
> whenever you run `git pull`. Then you can make all of your pull request branches based on this
26+
> `main` branch. Whenever you want to update your version of `main`, do a regular `git pull`.
2827
2928
## Committing and Pushing changes
3029

README.md

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

@@ -145,7 +145,7 @@ kind welcome!
145145
[version-badge]: https://img.shields.io/npm/v/@testing-library/preact
146146
[downloads-badge]: https://img.shields.io/npm/dw/@testing-library/preact
147147
[slack]: https://preact-slack.now.sh
148-
[license]: https://github.com/testing-library/preact-testing-library/blob/master/LICENSE
148+
[license]: https://github.com/testing-library/preact-testing-library/blob/main/LICENSE
149149
[license-badge]: https://img.shields.io/github/license/testing-library/preact-testing-library?color=b
150150
[emojis]: https://github.com/all-contributors/all-contributors#emoji-key
151151
[all-contributors]: https://github.com/all-contributors/all-contributors
@@ -159,7 +159,7 @@ kind welcome!
159159
[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
160160
[prs]: http://makeapullrequest.com
161161
[coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square
162-
[coc]: https://github.com/testing-library/preact-testing-library/blob/master/CODE_OF_CONDUCT.md
162+
[coc]: https://github.com/testing-library/preact-testing-library/blob/main/CODE_OF_CONDUCT.md
163163
[preact-slack]: https://preact-slack.now.sh/
164164
[preact-slack-badge]: https://preact-slack.now.sh/badge.svg
165165
[commitzen]: http://commitizen.github.io/cz-cli/

0 commit comments

Comments
 (0)