Skip to content

Commit

Permalink
changlogger: When amending, do not preserve default link (#39868)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
anomiex authored and matticbot committed Oct 23, 2024
1 parent 1eb321d commit 4d01559
Show file tree
Hide file tree
Showing 29 changed files with 111 additions and 111 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"automattic/jetpack-sync": "^3.14.3-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"yoast/phpunit-polyfills": "^1.1.1"
},
"autoload": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-admin-ui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-assets/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-boost-core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"automattic/wordbless": "dev-master"
},
"autoload": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"brain/monkey": "^2.6"
},
"autoload-dev": {
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-constants/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-explat/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6"
"automattic/jetpack-changelogger": "^4.2.7-alpha"
},
"autoload": {
"classmap": [
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-ip/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-licensing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require-dev": {
"automattic/wordbless": "@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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-logo/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.0"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"automattic/wordbless": "@dev",
"yoast/phpunit-polyfills": "^1.1.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/wordbless": "0.4.2"
},
"autoload": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"automattic/wordbless": "dev-master"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-redirect/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-roles/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"automattic/jetpack-sync": "^3.14.3-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/wordbless": "0.4.2"
},
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-stats/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"automattic/wordbless": "dev-master"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-status/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"automattic/jetpack-status": "^4.0.2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-search": "@dev",
"automattic/jetpack-waf": "^0.22.1",
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-plans/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.6",
"automattic/jetpack-changelogger": "^4.2.7-alpha",
"automattic/jetpack-status": "^4.0.2",
"automattic/wordbless": "@dev"
},
Expand Down
Loading

0 comments on commit 4d01559

Please sign in to comment.