From 278d5a2cbc8b856584ddda0db8c690bfba310695 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Tue, 10 Oct 2023 10:33:17 -0700 Subject: [PATCH 1/2] Update CONTRIBUTING.md --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b000a11..eb7de545 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,11 +34,11 @@ The `main` branch matches the latest stable release deployed to [wp.org](wp.org) 1. From `develop`, checkout a new branch `release_X.Y.Z`. 1. Make a release commit: * Drop the `-dev` from the version number in `README.md`, `readme.txt`, and `pantheon-sessions.php`. - * Add the date to the "X.Y.X" heading in the changelog + * Update the "X.Y.Z-dev" heading in the changelog to the new version number with the date * Commit these changes with the message `Release X.Y.Z` * Push the release branch up. -1. Open a Pull Request to merge `release_X.Y.Z` into `main`. Your PR should consist of all commits to `develop` since the last release, and one commit to update the version number. The PR name should also be `Release X.Y.Z`. Copy the changelog for the current release to the PR body. -1. After all tests pass and you have received approval from a [CODEOWNER](./CODEOWNERS), merge the PR into `main`. "Rebase and merge" is preferred in this case. _Never_ squash to `main`. +1. Open a Pull Request to merge `release_X.Y.Z` into `main`. Your PR should consist of all commits to `develop` since the last release, and one commit to update the version number. The PR name should also be `Release X.Y.Z`. +1. After all tests pass and you have received approval from a [CODEOWNER](./CODEOWNERS), merge the PR into `main`. A merge commit is preferred in this case. A rebase or squash to `main` otherwise necessitates a force push to `develop` at a later step. 1. Pull `main` locally, create a new tag (based on version number from previous steps), and push up. The tag should _only_ be the version number. It _should not_ be prefixed `v` (i.e. `X.Y.Z`, not `vX.Y.X`). * `git tag X.Y.Z` * `git push --tags` @@ -52,7 +52,7 @@ The `main` branch matches the latest stable release deployed to [wp.org](wp.org) * `git checkout develop` * `git rebase main` * Update the version number in all locations, incrementing the version by one patch version, and add the `-dev` flag (e.g. after releasing `1.2.3`, the new verison will be `1.2.4-dev`) - * Add a new `** X.Y.X-dev **` heading to the changelog + * Add a new ** X.Y.Z-dev ** heading to the changelog where X.Y.Z-dev is the new patch version. * `git add -A .` * `git commit -m "Prepare X.Y.X-dev"` * `git push origin develop` From 2e81abaef333d99ce73d434f68d6e08b330f2204 Mon Sep 17 00:00:00 2001 From: Phil Tyler Date: Tue, 17 Oct 2023 15:31:02 -0700 Subject: [PATCH 2/2] fix readme spacing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68aaa85d..b268ee95 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **Tags:** comments, sessions **Requires at least:** 4.7 **Tested up to:** 6.3 -**Stable tag:** 1.4.1-dev +**Stable tag:** 1.4.1-dev **Requires PHP:** 5.4 **License:** GPLv2 or later **License URI:** http://www.gnu.org/licenses/gpl-2.0.html