Skip to content

Commit 49dc8a3

Browse files
eggrobineggrobin
committed
Merge remote-tracking branch 'la-vache/main' into nv-for-Xsux-Lo
2 parents ae6bc36 + 1c3c031 commit 49dc8a3

File tree

349 files changed

+317732
-75427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

349 files changed

+317732
-75427
lines changed

‎.github/ISSUE_TEMPLATE/unicodedata.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Feedback on Unicode data, properties, algorithms
3+
about: Not for reporting bugs or suggestions
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
## Members of UTC/PAG and other Unicoders with access
11+
Please submit an issue in the Unicode-internal PAG repo.
12+
13+
## Otherwise
14+
Please submit feedback via https://www.unicode.org/reporting.html

‎.github/ISSUE_TEMPLATE/unicodetools.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
name: Feedback on the internal Unicode Tools code and processes
3+
about: Internal tools used by UTC/PAG
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
(Bugs, suggestions, ideas for internal Unicode Tools code, for its maintainers, their processes, etc.)
11+
12+
(These tools are public and open source but not public deliverables. They are used internally by Unicode maintainers.
13+
Data is published at https://www.unicode.org/Public/ -- feedback: https://www.unicode.org/reporting.html)

‎.github/workflows/build-jsp.yml‎

Lines changed: 58 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,40 @@ name: Build JSP
33
env:
44
CURRENT_UVERSION: 17.0.0 # FIX_FOR_NEW_VERSION
55
PREVIOUS_UVERSION: 16.0.0 # not used at present
6+
REGISTRY: ghcr.io
7+
IMAGE_NAME: ${{ github.repository }}
68

79
on:
8-
push:
9-
branches:
10-
- '*'
1110
pull_request:
1211
branches:
1312
- '*'
13+
push:
14+
tags:
15+
- '*'
1416
jobs:
1517
build:
1618
runs-on: ubuntu-latest
19+
permissions:
20+
contents: read
21+
packages: write
22+
attestations: write
23+
id-token: write
1724
steps:
18-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
1926
- name: Get the CLDR_REF from pom.xml
2027
id: cldr_ref
2128
run: echo "CLDR_REF="$(mvn help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) >> $GITHUB_OUTPUT && cat ${GITHUB_OUTPUT}
2229
- name: Verify CLDR checkout ref
2330
run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
2431
- name: Cache CLDR repository
25-
uses: actions/cache@v3
32+
uses: actions/cache@v4
2633
with:
2734
path: cldr
2835
key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
2936
restore-keys: |
3037
cldr
3138
- name: Check out CLDR
32-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
3340
with:
3441
repository: unicode-org/cldr
3542
path: cldr
@@ -45,12 +52,16 @@ jobs:
4552
with:
4653
java-version: 11
4754
- name: Cache local Maven repository
48-
uses: actions/cache@v2
55+
uses: actions/cache@v4
4956
with:
5057
path: ~/.m2/repository
5158
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
5259
restore-keys: |
5360
${{ runner.os }}-maven-
61+
- name: Fetch Last Resort Font
62+
run: |
63+
wget https://github.com/unicode-org/last-resort-font/releases/latest/download/LastResort-Regular.ttf
64+
mv ./LastResort-Regular.ttf ./UnicodeJsps/src/main/webapp/
5465
# TODO: move this DOWN after JSPs once it works
5566
- name: Regenerate the property cache files
5667
run: >
@@ -69,10 +80,46 @@ jobs:
6980
env:
7081
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7182
- name: Upload UnicodeJsps.war
72-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
7384
with:
7485
name: UnicodeJsps
7586
path: UnicodeJsps/target/UnicodeJsps.war
76-
- name: build docker image
77-
run: cd UnicodeJsps && bash update-bidic-ucd.sh && docker build .
78-
87+
- name: Build C Bidi
88+
run: cd UnicodeJsps && bash update-bidic-ucd.sh
89+
- name: Log in to the Container registry
90+
if: github.event_name != 'pull_request'
91+
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
92+
with:
93+
registry: ${{ env.REGISTRY }}
94+
username: ${{ github.actor }}
95+
password: ${{ secrets.GITHUB_TOKEN }}
96+
- name: Extract metadata (tags, labels) for Docker
97+
id: meta
98+
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
99+
with:
100+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
101+
- name: Build and push Docker image
102+
if: github.event_name != 'pull_request'
103+
id: push
104+
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
105+
with:
106+
context: UnicodeJsps/
107+
push: true
108+
tags: ${{ steps.meta.outputs.tags }}
109+
labels: ${{ steps.meta.outputs.labels }}
110+
- name: Build and Docker image (PR)
111+
if: github.event_name == 'pull_request'
112+
id: builddocker
113+
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
114+
with:
115+
context: UnicodeJsps/
116+
push: false
117+
tags: ${{ steps.meta.outputs.tags }}
118+
labels: ${{ steps.meta.outputs.labels }}
119+
- name: Generate artifact attestation
120+
if: github.event_name != 'pull_request'
121+
uses: actions/attest-build-provenance@v2
122+
with:
123+
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
124+
subject-digest: ${{ steps.push.outputs.digest }}
125+
push-to-registry: true

‎.github/workflows/cache_retain.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ jobs:
3030
retain-maven-cache:
3131
name: Run all tests with Maven
3232
runs-on: ubuntu-latest
33+
# Only run this on the upstream repo. Otherwise, running in a personal fork will cause
34+
# Github to disable the personal fork copy of the workflow
35+
# (Github complains about running a scheduled workflow on a repo with > 60 days of inactivity)
36+
if: github.ref == 'refs/heads/main' && github.repository == 'unicode-org/unicodetools'
3337
steps:
3438
- name: Checkout and setup
3539
uses: actions/checkout@v2
@@ -38,7 +42,7 @@ jobs:
3842
with:
3943
java-version: 11
4044
- name: Cache local Maven repository
41-
uses: actions/cache@v2
45+
uses: actions/cache@v4
4246
with:
4347
path: ~/.m2/repository
4448
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/cli-build-instructions.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Verify CLDR checkout ref
4646
run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
4747
- name: Cache CLDR repository
48-
uses: actions/cache@v3
48+
uses: actions/cache@v4
4949
with:
5050
path: cldr
5151
key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -71,7 +71,7 @@ jobs:
7171
with:
7272
java-version: 11
7373
- name: Cache local Maven repository
74-
uses: actions/cache@v2
74+
uses: actions/cache@v4
7575
with:
7676
path: ~/.m2/repository
7777
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -113,7 +113,7 @@ jobs:
113113
- name: Verify CLDR checkout ref
114114
run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
115115
- name: Cache CLDR repository
116-
uses: actions/cache@v3
116+
uses: actions/cache@v4
117117
with:
118118
path: cldr/mine/src
119119
key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -133,7 +133,7 @@ jobs:
133133
with:
134134
java-version: 11
135135
- name: Cache local Maven repository
136-
uses: actions/cache@v2
136+
uses: actions/cache@v4
137137
with:
138138
path: ~/.m2/repository
139139
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -176,7 +176,7 @@ jobs:
176176

177177
- name: Upload UnicodeTestResults artifact
178178
if: always()
179-
uses: actions/upload-artifact@v3
179+
uses: actions/upload-artifact@v4
180180
with:
181181
name: unicode-test-results
182182
path: |
@@ -297,7 +297,7 @@ jobs:
297297
- name: Verify CLDR checkout ref
298298
run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
299299
- name: Cache CLDR repository
300-
uses: actions/cache@v3
300+
uses: actions/cache@v4
301301
with:
302302
path: cldr/mine/src
303303
key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -317,7 +317,7 @@ jobs:
317317
with:
318318
java-version: 11
319319
- name: Cache local Maven repository
320-
uses: actions/cache@v2
320+
uses: actions/cache@v4
321321
with:
322322
path: ~/.m2/repository
323323
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -375,7 +375,7 @@ jobs:
375375
- name: Verify CLDR checkout ref
376376
run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
377377
- name: Cache CLDR repository
378-
uses: actions/cache@v3
378+
uses: actions/cache@v4
379379
with:
380380
path: cldr/mine/src
381381
key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -395,7 +395,7 @@ jobs:
395395
with:
396396
java-version: 11
397397
- name: Cache local Maven repository
398-
uses: actions/cache@v2
398+
uses: actions/cache@v4
399399
with:
400400
path: ~/.m2/repository
401401
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/push-jsp-on-tag.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Verify CLDR checkout ref
1919
run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
2020
- name: Cache CLDR
21-
uses: actions/cache@v2
21+
uses: actions/cache@v4
2222
with:
2323
path: cldr
2424
key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -37,7 +37,7 @@ jobs:
3737
run:
3838
mkdir -p UnicodeJsps/target && tar -cpz --exclude=.git -f UnicodeJsps/target/cldr-unicodetools.tgz ./cldr ./unicodetools
3939
- name: Cache local Maven repository
40-
uses: actions/cache@v2
40+
uses: actions/cache@v4
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -49,7 +49,7 @@ jobs:
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5151
- name: Upload UnicodeJsps.war
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: UnicodeJsps
5555
path: UnicodeJsps/target/UnicodeJsps.war

‎UnicodeJsps/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<groupId>com.ibm.icu</groupId>
3232
<artifactId>icu4j</artifactId>
3333
</dependency>
34-
35-
<dependency>
36-
<groupId>com.ibm.icu</groupId>
37-
<artifactId>utilities-for-cldr</artifactId>
38-
</dependency>
3934
<!-- cldr -->
4035
<dependency>
4136
<groupId>org.unicode.cldr</groupId>

‎UnicodeJsps/src/main/java/org/unicode/jsp/Annotations.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.unicode.jsp;
22

3-
import com.ibm.icu.dev.util.UnicodeMap;
3+
import com.ibm.icu.impl.UnicodeMap;
44
import com.ibm.icu.impl.Utility;
55
import com.ibm.icu.text.UnicodeSet;
66
import java.util.Collections;

‎UnicodeJsps/src/main/java/org/unicode/jsp/BidiCharMap.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** */
22
package org.unicode.jsp;
33

4-
import com.ibm.icu.dev.util.UnicodeMap;
4+
import com.ibm.icu.impl.UnicodeMap;
55
import com.ibm.icu.lang.UCharacter;
66
import com.ibm.icu.lang.UProperty;
77
import com.ibm.icu.text.UnicodeSet;

‎UnicodeJsps/src/main/java/org/unicode/jsp/Confusables.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.unicode.jsp;
22

3-
import com.ibm.icu.dev.util.UnicodeMap;
3+
import com.ibm.icu.impl.UnicodeMap;
44
import com.ibm.icu.impl.Utility;
55
import com.ibm.icu.text.Normalizer;
66
import com.ibm.icu.text.Normalizer.Mode;

0 commit comments

Comments
 (0)