From 9c1cb73f7d9455e27b45465125271903c1a4d80e Mon Sep 17 00:00:00 2001 From: "Shane F. Carr" Date: Wed, 1 Jul 2026 16:08:35 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Update=20ICU4C=20and=20ICU4J=20t?= =?UTF-8?q?o=2078.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update ICU4C to 78.3 in run_config.json, setup_linux.sh, setup_macos.sh. - Update ICU4J to 78.3 in pom.xml and run_config.json. - Update Node and ICU4X mappings in datasets.py. - Pin CLDR branches for plurals in plurals.py to avoid instability. Co-authored-by: Gemini <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- executors/icu4j/74/executor-icu4j/pom.xml | 2 +- run_config.json | 12 ++++++------ setup_linux.sh | 8 ++++---- setup_macos.sh | 8 ++++---- testdriver/datasets.py | 6 ++++-- testgen/generators/plurals.py | 6 ++++++ 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/executors/icu4j/74/executor-icu4j/pom.xml b/executors/icu4j/74/executor-icu4j/pom.xml index b62e93a4..44a2c79e 100644 --- a/executors/icu4j/74/executor-icu4j/pom.xml +++ b/executors/icu4j/74/executor-icu4j/pom.xml @@ -177,7 +177,7 @@ com.ibm.icu icu4j - 78.1 + 78.3 diff --git a/run_config.json b/run_config.json index 554554e5..3014f6a3 100644 --- a/run_config.json +++ b/run_config.json @@ -25,9 +25,9 @@ }, { "prereq": { - "name": "Get ICU4C 78", - "version": "78.1", - "command": "bash ../executors/cpp/set_icu4c_binary.sh ../gh-cache icu4c-78.1-Ubuntu22.04-x64.tgz icu4c-78.1-sources.tgz" + "name": "Get ICU4C 78.3", + "version": "78.3", + "command": "bash ../executors/cpp/set_icu4c_binary.sh ../gh-cache icu4c-78.3-Ubuntu22.04-x64.tgz icu4c-78.3-sources.tgz" }, "run": { "icu_version": "icu78", @@ -180,7 +180,7 @@ }, { "prereq": { - "name": "nvm 26.3.0, icu78.1", + "name": "nvm 26.3.0, icu78.3", "version": "26.3.0", "command": "nvm install 26.3.0;nvm use 26.3.0 --silent" }, @@ -711,8 +711,8 @@ }, { "prereq": { - "name": "mvn-icu4j-78-shaded", - "version": "78", + "name": "mvn-icu4j-78.3-shaded", + "version": "78.3", "command": "mvn -q -P icu78 -f ../executors/icu4j/74/executor-icu4j/pom.xml package" }, "run": { diff --git a/setup_linux.sh b/setup_linux.sh index df0af1e1..38d5fec6 100755 --- a/setup_linux.sh +++ b/setup_linux.sh @@ -107,10 +107,10 @@ function download_77_1() { fi } -function download_78_1() { - if [[ ! -f icu4c-78.1-Ubuntu22.04-x64.tgz ]] +function download_78_3() { + if [[ ! -f icu4c-78.3-Ubuntu22.04-x64.tgz ]] then - wget https://github.com/unicode-org/icu/releases/download/release-78.1/icu4c-78.1-Ubuntu22.04-x64.tgz + wget https://github.com/unicode-org/icu/releases/download/release-78.3/icu4c-78.3-Ubuntu22.04-x64.tgz fi } @@ -124,6 +124,6 @@ function download_78_1() { download_75_1 download_76_1 download_77_1 - download_78_1 + download_78_3 popd diff --git a/setup_macos.sh b/setup_macos.sh index 34c26872..3e46f218 100755 --- a/setup_macos.sh +++ b/setup_macos.sh @@ -117,10 +117,10 @@ function download_77_1() { fi } -function download_78_1() { - if [[ ! -f icu4c-78.1-sources.tgz ]] +function download_78_3() { + if [[ ! -f icu4c-78.3-sources.tgz ]] then - curl -L -O https://github.com/unicode-org/icu/releases/download/release-78.1/icu4c-78.1-sources.tgz + curl -L -O https://github.com/unicode-org/icu/releases/download/release-78.3/icu4c-78.3-sources.tgz fi } @@ -134,6 +134,6 @@ download_74_2 download_75_1 download_76_1 download_77_1 -download_78_1 +download_78_3 popd \ No newline at end of file diff --git a/testdriver/datasets.py b/testdriver/datasets.py index a35c30a2..f6565beb 100644 --- a/testdriver/datasets.py +++ b/testdriver/datasets.py @@ -293,8 +293,10 @@ class ICU4XVersion(Enum): # What versions of NodeJS use specific ICU versions # https://nodejs.org/en/download/releases/ NodeICUVersionMap = { + '26.3.0': '78.3', '24.0.0': '77.1', '23.11.0': '76.1', + '23.3.0': '76.1', '22.9.0': '75.1', '21.6.0': '74.1', '20.1.0': '73.1', @@ -313,8 +315,8 @@ class ICU4XVersion(Enum): # TODO: fill this in '1.0': '71.1', '1.61.0': '71.1', - '2.1': '78.1', - '2.2': '78.1' + '2.1': '78.3', + '2.2': '78.3' } ICUVersionMap = { diff --git a/testgen/generators/plurals.py b/testgen/generators/plurals.py index fd6e5d42..43dfcbc8 100644 --- a/testgen/generators/plurals.py +++ b/testgen/generators/plurals.py @@ -28,6 +28,12 @@ def plurals_descriptor(self): cldr_git_version = 'maint/maint-44' elif self.icu_version == "icu75": cldr_git_version = 'maint/maint-45' + elif self.icu_version == "icu76": + cldr_git_version = 'maint/maint-46' + elif self.icu_version == "icu77": + cldr_git_version = 'maint/maint-47' + elif self.icu_version == "icu78": + cldr_git_version = 'maint/maint-48' cardinal_source = 'https://github.com/unicode-org/cldr/blob/%s/common/supplemental/plurals.xml' % cldr_git_version ordinal_source = 'https://github.com/unicode-org/cldr/blob/%s/common/supplemental/ordinals.xml' % cldr_git_version