From 7d3806198a81053d70a4a15ea6e0644a4139be93 Mon Sep 17 00:00:00 2001 From: Samiff Date: Tue, 13 Feb 2024 13:29:59 -0700 Subject: [PATCH] VaultPress plugin: use autotagger and autorelease (#35614) * VaultPress plugin: use autotagger and autorelease * Update outdated plugin release instructions * changelog * Refresh lock file --- docs/monorepo.md | 10 +--------- .../changelog/update-vaultpress-plugin-use-autotag | 5 +++++ projects/plugins/vaultpress/composer.json | 4 ++++ projects/plugins/vaultpress/composer.lock | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 projects/plugins/vaultpress/changelog/update-vaultpress-plugin-use-autotag diff --git a/docs/monorepo.md b/docs/monorepo.md index 9bd9ccb98c4dd..11f144f3b55a2 100644 --- a/docs/monorepo.md +++ b/docs/monorepo.md @@ -277,15 +277,7 @@ If `.extra.autotagger` is set to an object with falsey value for `v` (i.e. if `. Note that, for this to work, you'll need to create a secret `API_TOKEN_GITHUB` in the mirror repo. The value of the secret must be a GitHub access token. See PCYsg-xsv-p2#mirror-repo-secrets for details. -This is intended to work in combination with [Changelogger](#jetpack-changelogger): When any change files are present in the project, a `-alpha` version entry will be written to the changelog so the autotagging will not be triggered. To release a new version, you'd do the following: - -1. (optional) Activate the "Release Lock" (see PCYsg-zQS-p2#generating-a-new-changelog). -2. Use `tools/changelogger-release.sh` to create a PR rolling the change files into a new changelog entry. -3. Push and merge that PR. -4. If you used the Release Lock in step 1, go turn it off. If you didn't, check that no one merged any PRs in between steps 2 and 3 that added change files to the projects being released. - * If they did, you'll likely have to create a release branch in the affected projects' mirror repos and manually tag. -5. Verify that the Build workflow run for your PR's merge to trunk succeeded. [This search](https://github.com/Automattic/jetpack/actions/workflows/build.yml?query=branch%3Atrunk) will show the runs of that workflow for all merges to trunk. - * If it failed, you can try re-running it as long as no other PRs were merged. If some were merged, you'll have to manually tag the affected projects. +This is intended to work in combination with [Changelogger](#jetpack-changelogger): When any change files are present in the project, a `-alpha` version entry will be written to the changelog so the autotagging will not be triggered. To release a new plugin version, see: PCYsg-SU8-p2 ### Auto-release diff --git a/projects/plugins/vaultpress/changelog/update-vaultpress-plugin-use-autotag b/projects/plugins/vaultpress/changelog/update-vaultpress-plugin-use-autotag new file mode 100644 index 0000000000000..3e482969e8538 --- /dev/null +++ b/projects/plugins/vaultpress/changelog/update-vaultpress-plugin-use-autotag @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Use autotagger and autorelease in composer.json + + diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json index 7face32ced990..85fe91ef00b8c 100644 --- a/projects/plugins/vaultpress/composer.json +++ b/projects/plugins/vaultpress/composer.json @@ -41,6 +41,10 @@ } }, "extra": { + "autorelease": true, + "autotagger": { + "v": false + }, "mirror-repo": "Automattic/vaultpress", "release-branch-prefix": "vaultpress", "version-constants": { diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock index c3558642cdb53..7a35e31541944 100644 --- a/projects/plugins/vaultpress/composer.lock +++ b/projects/plugins/vaultpress/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4af54d0b802692d27e52ee465a30d16c", + "content-hash": "012b22c1aede0d5b5b64a5858ae5efe3", "packages": [ { "name": "automattic/jetpack-autoloader",