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 a5fc822 commit 1d6e830
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion 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"
},
"autoload": {
"classmap": [
Expand Down
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-device-detection/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
4 changes: 2 additions & 2 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "92b614e873d90f69847bc143c21b8a997e0c0428"
"reference": "77353da5f11350060991595061a97d756ddb43e2"
},
"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": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'automattic/jetpack-device-detection' => array(
'pretty_version' => '2.1.5',
'version' => '2.1.5.0',
'reference' => '92b614e873d90f69847bc143c21b8a997e0c0428',
'reference' => '77353da5f11350060991595061a97d756ddb43e2',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/jetpack-device-detection',
'aliases' => array(),
Expand Down

0 comments on commit 1d6e830

Please sign in to comment.