Skip to content

Commit

Permalink
Merge pull request #201 from PHPCSStandards/feature/160-update-refere…
Browse files Browse the repository at this point in the history
…nces-to-default-branch

Rename references to `master` branch
  • Loading branch information
Potherca authored Jan 5, 2023
2 parents fcae465 + 02f83b9 commit 4be4390
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions .github/workflows/integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quicktest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
# Run on pushes to feature branches.
push:
branches-ignore:
- master
- main
# Allow manually triggering the workflow.
workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:

Expand Down

0 comments on commit 4be4390

Please sign in to comment.