Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: update ICU to 74.2 and timezone to 2024a #51723

Closed
wants to merge 3 commits into from
Closed

deps: update ICU to 74.2 and timezone to 2024a #51723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de324ff
tools: fix update-icu.sh
targos Feb 11, 2024
1dffffc
deps: update icu to 74.2
targos Feb 11, 2024
a43067a
deps: update timezone to 2024a
targos Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deps/icu-small/source/common/unicode/uvernum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 1
#define U_ICU_VERSION_MINOR_NUM 2

/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
Expand Down Expand Up @@ -132,7 +132,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "74.1"
#define U_ICU_VERSION "74.2"

/**
* The current ICU library major version number as a string, for library name suffixes.
Expand All @@ -151,7 +151,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "74.1"
#define U_ICU_DATA_VERSION "74.2"
#endif /* U_HIDE_INTERNAL_API */

/*===========================================================================
Expand Down
Binary file modified deps/icu-small/source/data/in/icudt74l.dat.bz2
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions deps/icu-small/source/i18n/dtptngen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ struct DateTimePatternGenerator::AvailableFormatsSink : public ResourceSink {
AvailableFormatsSink(DateTimePatternGenerator& _dtpg) : dtpg(_dtpg) {}
virtual ~AvailableFormatsSink();

virtual void put(const char *key, ResourceValue &value, UBool isRoot,
virtual void put(const char *key, ResourceValue &value, UBool /*isRoot*/,
UErrorCode &errorCode) override {
const UnicodeString formatKey(key, -1, US_INV);
if (!dtpg.isAvailableFormatSet(formatKey) ) {
Expand All @@ -1032,7 +1032,7 @@ struct DateTimePatternGenerator::AvailableFormatsSink : public ResourceSink {
// derived from std patterns, but not a previous availableFormats entry:
const UnicodeString& formatValue = value.getUnicodeString(errorCode);
conflictingPattern.remove();
dtpg.addPatternWithSkeleton(formatValue, &formatKey, !isRoot, conflictingPattern, errorCode);
dtpg.addPatternWithSkeleton(formatValue, &formatKey, true, conflictingPattern, errorCode);
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/tz-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2023d
2024a
12 changes: 6 additions & 6 deletions test/parallel/test-icu-env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,19 @@ if (isMockable) {
locales.map((LANG) => runEnvOutside({ LANG, TZ: 'Europe/Zurich' }, 'new Date(333333333333).toLocaleString()')),
[
'7/25/1980, 1:35:33 AM',
'1980/7/25 1:35:33',
'1980/7/25 01:35:33',
'25/7/1980, 1:35:33 am',
'25/7/1980, 1:35:33',
'25/07/1980 1:35:33',
'25/07/1980 01:35:33',
'٢٥‏/٧‏/١٩٨٠، ١:٣٥:٣٣ ص',
'২৫/৭/১৯৮০, ১:৩৫:৩৩ AM',
'25.07.1980, 1:35:33',
'25/07/1980, 1:35:33',
'25.07.1980, 01:35:33',
'25/07/1980, 01:35:33',
'25/7/1980، 1:35:33 AM',
'25/7/1980, 01.35.33',
'25.7.1980, 1:35:33',
'25.7.1980, 01:35:33',
'1980/7/25 1:35:33',
'25/7/1980 1:35:33',
'25/7/1980 01:35:33',
'२५/७/१९८०, १:३५:३३ AM',
'25/7/1980 1:35:33 AM',
]
Expand Down
2 changes: 1 addition & 1 deletion tools/dep_updaters/update-icu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ NEW_VERSION_TGZ="icu4c-${LOW_DASHED_NEW_VERSION}-src.tgz"

NEW_VERSION_TGZ_URL="https://github.com/unicode-org/icu/releases/download/release-${DASHED_NEW_VERSION}/$NEW_VERSION_TGZ"

NEW_VERSION_MD5="https://github.com/unicode-org/icu/releases/download/release-${DASHED_NEW_VERSION}/icu4c-${LOW_DASHED_NEW_VERSION}-src.md5"
NEW_VERSION_MD5="https://github.com/unicode-org/icu/releases/download/release-${DASHED_NEW_VERSION}/icu4c-${LOW_DASHED_NEW_VERSION}-sources.md5"

CHECKSUM=$(curl -sL "$NEW_VERSION_MD5" | grep "$NEW_VERSION_TGZ" | grep -v "\.asc$" | awk '{print $1}')

Expand Down
4 changes: 2 additions & 2 deletions tools/icu/current_ver.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"url": "https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz",
"md5": "71e60b22697c4f35820a1897417dbab4"
"url": "https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src.tgz",
"md5": "94c0b370f43123ea92b146ebea9c709d"
}
]