Skip to content

[pull] main from unicode-org:main #162

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

Merged
pull merged 2 commits into from
Dec 22, 2025
Merged

[pull] main from unicode-org:main #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e74947
ICU-23270 Fix failing icu4j perf in CI
mihnita Dec 22, 2025
cd4bcbd
ICU-23270 Fix failing icu4j perf in CI - ndjson support
mihnita Dec 22, 2025
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
37 changes: 15 additions & 22 deletions .github/workflows/icu_merge_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
LD_LIBRARY_PATH=lib ./test/perf/${{ matrix.perf }}/${{ matrix.perf }} ${{ matrix.flag }} -t 5 -p 10 ${{ matrix.file }} ${{ matrix.tests }} | tee test/perf/results/${{ matrix.perf }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
LD_LIBRARY_PATH=lib ./test/perf/${{ matrix.perf }}/${{ matrix.perf }} ${{ matrix.flag }} -t 5 -p 10 -f $DATA_FILE_PATH/${{ matrix.data }}.txt ${{ matrix.tests }} | tee test/perf/results/${{ matrix.perf }}/${{ matrix.data }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
LD_LIBRARY_PATH=lib ./test/perf/strsrchperf/strsrchperf -b Test_ICU_Forward_Search Test_ICU_Backward_Search -t 5 -p 10 -L ${{ matrix.locale }} -f $DATA_FILE_PATH/${{ matrix.data }}.txt | tee test/perf/results/strsrchperf/${{ matrix.locale }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -337,16 +337,14 @@ jobs:

- name: Build and run unicodesetperf test
run: |
cd icu4j;
mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests;
git status
cd perf-tests;
cd icu4j/perf-tests;
mkdir -p perf/results/j_unicodesetperf/${{ matrix.perf }};
mvn dependency:copy-dependencies
java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.UnicodeSetPerf ${{ matrix.perf }} -a -t 2 -p 4 [:Lt:] | tee perf/results/j_unicodesetperf/${{ matrix.perf }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -391,15 +389,14 @@ jobs:

- name: Build and run ucharacterperf test
run: |
cd icu4j;
mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests;
cd perf-tests;
cd icu4j/perf-tests;
mkdir -p perf/results/j_ucharacterperf;
mvn dependency:copy-dependencies
java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.UCharacterPerf -a -t 2 -p 4 0 ffff | tee perf/results/j_ucharacterperf/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -447,9 +444,8 @@ jobs:

- name: Build and run decimalformatperf
run: |
cd icu4j;
mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests;
cd perf-tests;
cd icu4j/perf-tests;
mkdir -p perf/results/j_decimalformatperf/${{ matrix.locale }}/${{ matrix.perf }};
# Delay execution by random number of seconds. Spreading execution of multiple
# tests over 180 secs. minimizes the possibility of push conflicts when storing
Expand All @@ -459,7 +455,7 @@ jobs:
java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.DecimalFormatPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -L ${{ matrix.locale }} "#,###.##" "1.234,56" -r 1 | tee perf/results/j_decimalformatperf/${{ matrix.locale }}/${{ matrix.perf }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -510,9 +506,8 @@ jobs:
env:
DATA_FILE_PATH: data/collation
run: |
cd icu4j;
mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests;
cd perf-tests;
cd icu4j/perf-tests;
mkdir -p perf/results/j_normperf/${{ matrix.source_text }}/${{ matrix.perf }};
# Delay execution by random number of seconds. Spreading execution of multiple
# tests over 180 secs. minimizes the possibility of push conflicts when storing
Expand All @@ -523,7 +518,7 @@ jobs:
cat perf/results/j_normperf/${{ matrix.source_text }}/${{ matrix.perf }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -641,9 +636,8 @@ jobs:
env:
DATA_FILE_PATH: data/conversion
run: |
cd icu4j;
mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests;
cd perf-tests;
cd icu4j/perf-tests;
mkdir -p perf/results/j_converterperf/${{ matrix.source_text }}/${{ matrix.test_enc }}/${{ matrix.perf }};
# Delay execution by random number of seconds. Spreading execution of multiple
# tests over 180 secs. minimizes the possibility of push conflicts when storing
Expand All @@ -653,7 +647,7 @@ jobs:
java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.ConverterPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -f $DATA_FILE_PATH/${{ matrix.source_text }}.txt -e UTF-8 -T ${{ matrix.test_enc }} | tee perf/results/j_converterperf/${{ matrix.source_text }}/${{ matrix.test_enc }}/${{ matrix.perf }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down Expand Up @@ -719,9 +713,8 @@ jobs:
echo "DDIR=${ddir: -1}" >> $GITHUB_ENV
- name: Build and run dateformatperf
run: |
cd icu4j;
mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests;
cd perf-tests;
cd icu4j/perf-tests;
mkdir -p perf/results/j_dateformatperf/${{ matrix.locale }}/${{ matrix.perf }}/${{ env.DDIR }};
# Delay execution by random number of seconds. Spreading execution of multiple
# tests over 180 secs. minimizes the possibility of push conflicts when storing
Expand All @@ -731,7 +724,7 @@ jobs:
java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.DateFormatPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -L ${{ matrix.locale }} ${{ env.PARM }} -r 1 | tee perf/results/j_dateformatperf/${{ matrix.locale }}/${{ matrix.perf }}/${{ env.DDIR }}/output.txt

- name: Store performance test results
uses: gregtatum/github-action-benchmark@4eed2c2f4cd0d374720c4b913f79faa8aafcfa6b # v1.8.1
uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
with:
# The perf tests result data is in ndjson format.
tool: 'ndjson'
Expand Down