Skip to content

Commit 36c2df6

Browse files
committed
Updates related to branch rename from master to main
Note: install instructions in the README will be replaced still in a future commit. Closes 1916
1 parent 75a78cf commit 36c2df6

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ Since WPCS employs many sniffs that are part of PHPCS, sometimes an issue will b
1717

1818
## Branches
1919

20-
Ongoing development will be done in the `develop` branch with merges done into `master` once considered stable.
20+
Ongoing development will be done in the `develop` branch with merges to `main` once considered stable.
2121

2222
To contribute an improvement to this project, fork the repo and open a pull request to the `develop` branch. Alternatively, if you have push access to this repo, create a feature branch prefixed by `feature/` and then open an intra-repo PR from that branch to `develop`.
2323

24-
Once a commit is made to `develop`, a PR should be opened from `develop` into `master` and named "Next release". This PR will provide collaborators with a forum to discuss the upcoming stable release.
24+
Once a commit is made to `develop`, a PR should be opened from `develop` to `main` and named "Next release". This PR will provide collaborators with a forum to discuss the upcoming stable release.
2525

2626
# Considerations when writing sniffs
2727

.github/workflows/quicktest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Quick Tests
33
on:
44
push:
55
branches-ignore:
6-
- master
6+
- main
77
paths-ignore:
88
- '**.md'
99
# Allow manually triggering the workflow.

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Unit Tests
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
# Allow manually triggering the workflow.
99
workflow_dispatch:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ Initial tagged release.
11811181

11821182
[Composer PHPCS plugin]: https://github.com/PHPCSStandards/composer-installer
11831183

1184-
[Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/master...HEAD
1184+
[Unreleased]: https://github.com/WordPress/WordPress-Coding-Standards/compare/main...HEAD
11851185
[2.3.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.1...2.3.0
11861186
[2.2.1]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.2.0...2.2.1
11871187
[2.2.0]: https://github.com/WordPress/WordPress-Coding-Standards/compare/2.1.1...2.2.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ It is strongly suggested to `require` one of these plugins in your project to ha
9595

9696
2. Clone the WordPress standards repository:
9797

98-
git clone -b master https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
98+
git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
9999

100100
3. Add its path to the PHP_CodeSniffer configuration:
101101

@@ -111,7 +111,7 @@ To summarize:
111111
```bash
112112
cd ~/projects
113113
git clone https://github.com/squizlabs/PHP_CodeSniffer.git phpcs
114-
git clone -b master https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
114+
git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git wpcs
115115
cd phpcs
116116
./bin/phpcs --config-set installed_paths ../wpcs
117117
```

0 commit comments

Comments
 (0)