Skip to content

Commit

Permalink
changelogger: Normalize UTC timezone (#37436)
Browse files Browse the repository at this point in the history
It seems that some versions of git may be returning `Z` rather than
`+00:00` when reporting timezones from `%cI`, which broke a test.
Normalize it to `Z` always so the test can have a consistent value to
expect.

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/9129465139

Upstream-Ref: Automattic/jetpack@e80078a
  • Loading branch information
anomiex authored and matticbot committed May 17, 2024
1 parent 02cc4a5 commit 96b3bee
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.0",
"automattic/jetpack-changelogger": "^4.2.3"
"automattic/jetpack-changelogger": "^4.2.4-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.0",
"automattic/jetpack-changelogger": "^4.2.3"
"automattic/jetpack-changelogger": "^4.2.4-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": "1681df0d9d766d2c7da58863050a66bb3c90d8dd"
"reference": "7a61255fbaaadf1d37ea9b8c9ab9e2e6d5e95370"
},
"require": {
"php": ">=7.0"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.3",
"automattic/jetpack-changelogger": "^4.2.4-alpha",
"yoast/phpunit-polyfills": "1.1.0"
},
"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.3',
'version' => '2.1.3.0',
'reference' => '1681df0d9d766d2c7da58863050a66bb3c90d8dd',
'reference' => '7a61255fbaaadf1d37ea9b8c9ab9e2e6d5e95370',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/jetpack-device-detection',
'aliases' => array(),
Expand Down

0 comments on commit 96b3bee

Please sign in to comment.