changlogger: When amending, do not preserve default link (#39868)

When doing `changelogger write --amend`, we normally preserve the prologue, epilogue, and link unless these are overridden on the command line. An edge case is when you're amending version 1.2.3-beta to turn it into 1.2.3 release, and the link is the default link like `https://example.com/diff/1.2.2...1.2.3-beta`. In this situation we don't want to keep that link, we want to replace it with the new default `https://example.com/diff/1.2.2...1.2.3`. Also, when building changelogger, we have to install before trying to run it. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11487859862 Upstream-Ref: Automattic/jetpack@07e18c2
Automattic · Oct 23, 2024 · 957cd8e · 957cd8e
1 parent a40c59f
commit 957cd8e
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 43 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6"
+		"automattic/jetpack-changelogger": "^4.2.7-alpha"
 	},
 	"config": {
 		"allow-plugins": {

diff --git a/jetpack_vendor/automattic/jetpack-a8c-mc-stats/composer.json b/jetpack_vendor/automattic/jetpack-a8c-mc-stats/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6"
+		"automattic/jetpack-changelogger": "^4.2.7-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-admin-ui/composer.json b/jetpack_vendor/automattic/jetpack-admin-ui/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6",
+		"automattic/jetpack-changelogger": "^4.2.7-alpha",
 		"automattic/jetpack-logo": "^2.0.4",
 		"automattic/wordbless": "dev-master"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-assets/composer.json b/jetpack_vendor/automattic/jetpack-assets/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6",
+		"automattic/jetpack-changelogger": "^4.2.7-alpha",
 		"wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0"
 	},
 	"suggest": {

diff --git a/jetpack_vendor/automattic/jetpack-config/composer.json b/jetpack_vendor/automattic/jetpack-config/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.0"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.2.6",
+		"automattic/jetpack-changelogger": "^4.2.7-alpha",
 		"automattic/jetpack-connection": "@dev",
 		"automattic/jetpack-import": "@dev",
 		"automattic/jetpack-jitm": "@dev",

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -17,7 +17,7 @@
 		"automattic/wordbless": "@dev",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"brain/monkey": "2.6.1",
-		"automattic/jetpack-changelogger": "^4.2.6"
+		"automattic/jetpack-changelogger": "^4.2.7-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-constants/composer.json b/jetpack_vendor/automattic/jetpack-constants/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6"
+		"automattic/jetpack-changelogger": "^4.2.7-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-redirect/composer.json b/jetpack_vendor/automattic/jetpack-redirect/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6"
+		"automattic/jetpack-changelogger": "^4.2.7-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-roles/composer.json b/jetpack_vendor/automattic/jetpack-roles/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6"
+		"automattic/jetpack-changelogger": "^4.2.7-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-status/composer.json b/jetpack_vendor/automattic/jetpack-status/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^4.2.6",
+		"automattic/jetpack-changelogger": "^4.2.7-alpha",
 		"automattic/jetpack-connection": "@dev",
 		"automattic/jetpack-plans": "@dev",
 		"automattic/jetpack-ip": "^0.3.0"

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,13 +7,13 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "cb10e2c998cccd776fbfd13d34b3badda67d6967"
+                "reference": "3dd6d0c7b2c39a19bcd6be58e5ad76bd79d084ea"
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
             "suggest": {
@@ -60,13 +60,13 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "7f7f0c7e66a89c76af3828ff291abb5382da4f98"
+                "reference": "911392e998e6d6083a46499fd124fd592a3f7d1e"
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "automattic/jetpack-logo": "^2.0.4",
                 "automattic/wordbless": "dev-master",
                 "yoast/phpunit-polyfills": "^1.1.1"
@@ -125,14 +125,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "6ce4497f141138f027be07801e87d17d43d7beb9"
+                "reference": "a3b58076ffd2ef89503b106143d6b134b6def951"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.4",
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "brain/monkey": "2.6.1",
                 "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0",
                 "yoast/phpunit-polyfills": "^1.1.1"
@@ -194,14 +194,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "decbdb8793bf447ece8025abf95dc7b9a1988ddd"
+                "reference": "51ac5729c99c67746e6f8b8be2adee716a817d26"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0",
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "composer/composer": "^1.1 || ^2.0",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -261,14 +261,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "b37fc18ae164d10010d08f292be1dd570d9f6070"
+                "reference": "f518a0baf5744a06b2a6eae63f4bc3ebbe38333b"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0",
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "composer/composer": "^2.2 || ^2.4",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -321,13 +321,13 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "225dd73f937f33a8ea3be45e2767f830c8f0bc15"
+                "reference": "91a41127926afd1b4a3cd43b31d31d863bfd9b9b"
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "automattic/jetpack-connection": "@dev",
                 "automattic/jetpack-import": "@dev",
                 "automattic/jetpack-jitm": "@dev",
@@ -396,7 +396,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "63f20efd3421075d86dc38ce06c091fc598335e9"
+                "reference": "e38a750cd61a32c054c8237dd94a6b499e872d67"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.3",
@@ -409,7 +409,7 @@
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "automattic/wordbless": "@dev",
                 "brain/monkey": "2.6.1",
                 "yoast/phpunit-polyfills": "^1.1.1"
@@ -486,13 +486,13 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "6166e1093cb01dd65313fb4213ab1aacb669233e"
+                "reference": "a94ea5a9b4051ceccd5021da107e9139e2ab4820"
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "brain/monkey": "2.6.1",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -540,14 +540,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "3ffbd4f51a3378e06c5a71cd7d41819bc28da740"
+                "reference": "3eaab446cad0c322b1395f8fe943c924301f0bd2"
             },
             "require": {
                 "automattic/jetpack-status": "^4.0.2",
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "brain/monkey": "2.6.1",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -595,13 +595,13 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "b43e2fbd3772f7c63dd8f7d2d0936bad44b10e40"
+                "reference": "ad7d6784239d801cc98acf041cd078c72000b29d"
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "brain/monkey": "2.6.1",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -649,14 +649,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "3113ba437f2c619173152c8837f09aab81c47ca9"
+                "reference": "b983748b63db8720ed8271374a2fcd22ea8812b7"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.4",
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.7-alpha",
                 "automattic/jetpack-connection": "@dev",
                 "automattic/jetpack-ip": "^0.3.0",
                 "automattic/jetpack-plans": "@dev",

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -13,7 +13,7 @@
         'automattic/jetpack-a8c-mc-stats' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
-            'reference' => 'cb10e2c998cccd776fbfd13d34b3badda67d6967',
+            'reference' => '3dd6d0c7b2c39a19bcd6be58e5ad76bd79d084ea',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-a8c-mc-stats',
             'aliases' => array(),
@@ -22,7 +22,7 @@
         'automattic/jetpack-admin-ui' => array(
             'pretty_version' => '0.4.5',
             'version' => '0.4.5.0',
-            'reference' => '7f7f0c7e66a89c76af3828ff291abb5382da4f98',
+            'reference' => '911392e998e6d6083a46499fd124fd592a3f7d1e',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-admin-ui',
             'aliases' => array(),
@@ -31,7 +31,7 @@
         'automattic/jetpack-assets' => array(
             'pretty_version' => '2.3.10',
             'version' => '2.3.10.0',
-            'reference' => '6ce4497f141138f027be07801e87d17d43d7beb9',
+            'reference' => 'a3b58076ffd2ef89503b106143d6b134b6def951',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-assets',
             'aliases' => array(),
@@ -40,7 +40,7 @@
         'automattic/jetpack-autoloader' => array(
             'pretty_version' => '3.1.2',
             'version' => '3.1.2.0',
-            'reference' => 'decbdb8793bf447ece8025abf95dc7b9a1988ddd',
+            'reference' => '51ac5729c99c67746e6f8b8be2adee716a817d26',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../automattic/jetpack-autoloader',
             'aliases' => array(),
@@ -49,7 +49,7 @@
         'automattic/jetpack-composer-plugin' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
-            'reference' => 'b37fc18ae164d10010d08f292be1dd570d9f6070',
+            'reference' => 'f518a0baf5744a06b2a6eae63f4bc3ebbe38333b',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../automattic/jetpack-composer-plugin',
             'aliases' => array(),
@@ -58,7 +58,7 @@
         'automattic/jetpack-config' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
-            'reference' => '225dd73f937f33a8ea3be45e2767f830c8f0bc15',
+            'reference' => '91a41127926afd1b4a3cd43b31d31d863bfd9b9b',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-config',
             'aliases' => array(),
@@ -67,7 +67,7 @@
         'automattic/jetpack-connection' => array(
             'pretty_version' => '5.1.4',
             'version' => '5.1.4.0',
-            'reference' => '63f20efd3421075d86dc38ce06c091fc598335e9',
+            'reference' => 'e38a750cd61a32c054c8237dd94a6b499e872d67',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-connection',
             'aliases' => array(),
@@ -76,7 +76,7 @@
         'automattic/jetpack-constants' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
-            'reference' => '6166e1093cb01dd65313fb4213ab1aacb669233e',
+            'reference' => 'a94ea5a9b4051ceccd5021da107e9139e2ab4820',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-constants',
             'aliases' => array(),
@@ -94,7 +94,7 @@
         'automattic/jetpack-redirect' => array(
             'pretty_version' => '2.0.4',
             'version' => '2.0.4.0',
-            'reference' => '3ffbd4f51a3378e06c5a71cd7d41819bc28da740',
+            'reference' => '3eaab446cad0c322b1395f8fe943c924301f0bd2',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-redirect',
             'aliases' => array(),
@@ -103,7 +103,7 @@
         'automattic/jetpack-roles' => array(
             'pretty_version' => '2.0.3',
             'version' => '2.0.3.0',
-            'reference' => 'b43e2fbd3772f7c63dd8f7d2d0936bad44b10e40',
+            'reference' => 'ad7d6784239d801cc98acf041cd078c72000b29d',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-roles',
             'aliases' => array(),
@@ -112,7 +112,7 @@
         'automattic/jetpack-status' => array(
             'pretty_version' => '4.0.2',
             'version' => '4.0.2.0',
-            'reference' => '3113ba437f2c619173152c8837f09aab81c47ca9',
+            'reference' => 'b983748b63db8720ed8271374a2fcd22ea8812b7',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../../jetpack_vendor/automattic/jetpack-status',
             'aliases' => array(),