From 02f83b94cd7f2617807bcd88efe645c27817c54e Mon Sep 17 00:00:00 2001 From: jrfnl Date: Mon, 2 Jan 2023 22:29:43 +0100 Subject: [PATCH] Rename references to `master` branch This PR is to be merged in conjunction with the branch rename to `main` as discussed in 160 Fixes 160 --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- .github/workflows/integrationtest.yml | 4 ++-- .github/workflows/quicktest.yml | 2 +- CONTRIBUTING.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 98c31ca0..0e2a2687 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -49,5 +49,5 @@ Output of `vendor/bin/phpcs --config-show`: (Please paste the output you get here) ``` -## Tested against `master` branch? -- [ ] I have verified the issue still exists in the `master` branch. +## Tested against `main` branch? +- [ ] I have verified the issue still exists in the `main` branch. diff --git a/.github/workflows/integrationtest.yml b/.github/workflows/integrationtest.yml index 078733c7..05d176ad 100644 --- a/.github/workflows/integrationtest.yml +++ b/.github/workflows/integrationtest.yml @@ -2,10 +2,10 @@ name: Integration Test on: - # Run on pushes to `master` and on all pull requests. + # Run on pushes to `main` and on all pull requests. push: branches: - - master + - main pull_request: # Allow manually triggering the workflow. workflow_dispatch: diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index 1422bda7..f8f1f67b 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -5,7 +5,7 @@ on: # Run on pushes to feature branches. push: branches-ignore: - - master + - main # Allow manually triggering the workflow. workflow_dispatch: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5c4b8d99..9065e828 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ before making a change. Please note we have [a code of conduct][], please follow it in all your interactions with the project. -[a code of conduct]: https://github.com/PHPCSStandards/composer-installer/blob/master/CODE_OF_CONDUCT.md +[a code of conduct]: https://github.com/PHPCSStandards/composer-installer/blob/main/CODE_OF_CONDUCT.md ## Issues and feature requests @@ -131,7 +131,7 @@ A changelog can be generated using the [`github-changelog-generator`][github-cha Our release versions follow [Semantic Versioning][semver]. -New releases (and any related tags) are always created from the `master` branch. +New releases (and any related tags) are always created from the `main` branch. To create a new release: