diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index d8bfb3c..47ec0cf 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -3,7 +3,7 @@ on: push: branches: - '+([0-9])?(.{+([0-9]),x}).x' - - 'master' + - 'main' - 'next' - 'next-major' - 'beta' @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository == 'testing-library/preact-testing-library' && - contains('refs/heads/master,refs/heads/beta,refs/heads/next,refs/heads/alpha', github.ref) && + contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha', github.ref) && github.event_name == 'push' }} steps: - name: 🛑 Cancel Previous Runs @@ -79,7 +79,7 @@ jobs: branches: | [ '+([0-9])?(.{+([0-9]),x}).x', - 'master', + 'main', 'next', 'next-major', {name: 'beta', prerelease: true}, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74acdd4..ca73614 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,20 +11,19 @@ to an Open Source Project on GitHub][egghead] 2. Run `npm run setup -s` to install dependencies and run validation 3. Create a branch for your PR with `git checkout -b pr/your-branch-name` -> Tip: Keep your `master` branch pointing at the original repository and make pull requests from +> Tip: Keep your `main` branch pointing at the original repository and make pull requests from > branches on your fork. To do this, run: > > ``` > git remote add upstream https://github.com/testing-library/preact-testing-library.git > git fetch upstream -> git branch --set-upstream-to=upstream/master master +> git branch --set-upstream-to=upstream/main main > ``` > > This will add the original repository as a "remote" called "upstream," Then fetch the git -> information from that remote, then set your local `master` branch to use the upstream master -> branch whenever you run `git pull`. Then you can make all of your pull request branches based on -> this `master` branch. Whenever you want to update your version of `master`, do a regular -> `git pull`. +> information from that remote, then set your local `main` branch to use the upstream main branch +> whenever you run `git pull`. Then you can make all of your pull request branches based on this +> `main` branch. Whenever you want to update your version of `main`, do a regular `git pull`. ## Committing and Pushing changes diff --git a/README.md b/README.md index bedc09b..23cc1fa 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ height="80" width="80" alt="poodle" - src="https://raw.githubusercontent.com/testing-library/preact-testing-library/master/other/poodle.png" + src="https://raw.githubusercontent.com/testing-library/preact-testing-library/main/other/poodle.png" /> @@ -145,7 +145,7 @@ kind welcome! [version-badge]: https://img.shields.io/npm/v/@testing-library/preact [downloads-badge]: https://img.shields.io/npm/dw/@testing-library/preact [slack]: https://preact-slack.now.sh -[license]: https://github.com/testing-library/preact-testing-library/blob/master/LICENSE +[license]: https://github.com/testing-library/preact-testing-library/blob/main/LICENSE [license-badge]: https://img.shields.io/github/license/testing-library/preact-testing-library?color=b [emojis]: https://github.com/all-contributors/all-contributors#emoji-key [all-contributors]: https://github.com/all-contributors/all-contributors @@ -159,7 +159,7 @@ kind welcome! [prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square [prs]: http://makeapullrequest.com [coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square -[coc]: https://github.com/testing-library/preact-testing-library/blob/master/CODE_OF_CONDUCT.md +[coc]: https://github.com/testing-library/preact-testing-library/blob/main/CODE_OF_CONDUCT.md [preact-slack]: https://preact-slack.now.sh/ [preact-slack-badge]: https://preact-slack.now.sh/badge.svg [commitzen]: http://commitizen.github.io/cz-cli/