Updates for branch renames

jrfnl · jrfnl · commit fe4bd4f3ec25 · 2023-03-31T01:08:40.000+02:00
The `develop` branch has been renamed to `1.x` and a new `2.x` branch will be added to hold development for the `2.x` version.

The `main` branch, from now on, will be used as the release branch for PHPUnit Polyfills 2.x.
diff --git a/.github/RELEASE-CHECKLIST.md b/.github/RELEASE-CHECKLIST.md
@@ -1,8 +1,12 @@
-Template to use for release PRs from `develop` to `main`
+Template to use for release PRs from `#.x` to `main`
 ===========================================================
 
 Title: Release version x.x.x
 
+<!--
+If both a 1.x and a 2.x release are to be tagged, always tag the 1.x release first!
+-->
+
 ## Functional
 - [ ] Confirm that the most recent PHPUnit changelogs have been checked and that the library is still feature complete for those versions supported within the PHPUnit version constraints.
 - [ ] Update the `VERSION` constant in the `phpunitpolyfills-autoload.php` file.
@@ -13,8 +17,8 @@ Title: Release version x.x.x
     Verify that a release link at the bottom of the `CHANGELOG.md` file has been added.
 - [ ] Merge this PR.
 - [ ] Make sure all CI builds are green.
-- [ ] Tag the release (careful, GH defaults to `develop`!).
-- [ ] Create a release from the tag (careful, GH defaults to `develop`!) & copy & paste the changelog to it.
+- [ ] Tag the release (careful, GH defaults to `2.x`!).
+- [ ] Create a release from the tag (careful, GH defaults to `2.x`!) & copy & paste the changelog to it.
     Make sure to copy the links to the issues and the links to the GH usernames from the bottom of the changelog!
 - [ ] Close the milestone.
 - [ ] Open a new milestone for the next release.
diff --git a/README.md b/README.md
@@ -763,7 +763,7 @@ if ( defined( '\Yoast\PHPUnitPolyfills\Autoload::VERSION' ) === false
 
 Contributing
 ------------
-Contributions to this project are welcome. Clone the repo, branch off from `develop`, make your changes, commit them and send in a pull request.
+Contributions to this project are welcome. Clone the repo, branch off from the oldest #.x branch the patch applies to, make your changes, commit them and send in a pull request against the correct #.x branch.
 
 If you are unsure whether the changes you are proposing would be welcome, please open an issue first to discuss your proposal.
 
diff --git a/composer.json b/composer.json
@@ -44,8 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev",
-            "dev-develop": "1.x-dev"
+            "dev-main": "2.x-dev"
         }
     },
     "scripts": {
