Skip to content

Commit

Permalink
CLDR-17492 merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
srl295 committed May 30, 2024
2 parents 9868c14 + 39f57e7 commit d4ee48e
Show file tree
Hide file tree
Showing 724 changed files with 90,780 additions and 92,721 deletions.
14 changes: 11 additions & 3 deletions .github/COMMIT_METADATA.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
### The following list of commits is parsed by the ICU/CLDR commit checker to make corrections
### It has the following structure:
### `- <commit> <bug id or hyphen> <message>`
###
### Hint: To see full commit hashes use:
### git log --format='%H %s'

- 00decafbad CLDR-0000 Bad commit message
- 50257a7a3eba7bbed634961a2aa74e77b12810bf - Early commit, no bug id
Expand All @@ -21,6 +24,7 @@
- cf63211ac313545dcd153a74e4d19d0be593db41 CLDR-16712 v44 CLDRModify
- cbdd59767072c7ca154faae2d3b59ad6ad67dd1d CLDR-16650 v44 cherry-pick maint-43 to main
- f534e312f9c5b6984e5a941746adff08eff66c50 CLDR-16577 v44 merge maint-43 to main
- 09c8e1082808f97608c39062897a7b844d50c18e CLDR-17277 v45 accidental merge commit

### The following are items to skip for a certain CLDR version.
### Format: `# SKIP v00` followed by a list of commits to skip for that version (same structure as above)
Expand Down Expand Up @@ -56,6 +60,10 @@

# SKIP v45

- 1a52361654 CLDR-17141 kbd: drop transform=no (#3330) (cherry-picked to maint-44)
- 286a10b2b2 CLDR-17140 kbd: specify modifier matching (#3314) (cherry-picked to maint-44)
- 5f1d2981aa CLDR-17113 kbd: element/attr renaming (#3313) (cherry-picked to maint-44)
- 1a52361654f5d9c58f084d1d919080423862975a CLDR-17141 kbd: drop transform=no (#3330) (cherry-picked to maint-44)
- 286a10b2b26fb4db33b4225a9f6d7a59eb1608d5 CLDR-17140 kbd: specify modifier matching (#3314) (cherry-picked to maint-44)
- 5f1d2981aa384660722d5788ad7e396f86af9f97 CLDR-17113 kbd: element/attr renaming (#3313) (cherry-picked to maint-44)
- 73e4014f703e78e7868abc218b3e8f60f912cb96 CLDR-17229 kbd: cherry pick FROM maint-44
- 13db39076da1999260ad5ad85b6fc2bf8050756f CLDR-17141 kbd: fixed in 44
- 09c8e1082808f97608c39062897a7b844d50c18e CLDR-17230 emoji: fixed in 44.1
- 657e6e996b88b891132db29cc4fc61c36f174689 CLDR-17141 kbd: fixed in 44
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-17168 gh:"
prefix: "CLDR-17492 gh:"
assignees:
- btangmu
- srl295
Expand All @@ -25,7 +25,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-17168 js:"
prefix: "CLDR-17492 js:"
assignees:
- btangmu
- srl295
Expand All @@ -39,7 +39,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-17168 tr:"
prefix: "CLDR-17492 tr:"
assignees:
- btangmu
- srl295
Expand All @@ -54,7 +54,7 @@ updates:
interval: "monthly"
commit-message:
include: scope
prefix: "CLDR-17168 j:"
prefix: "CLDR-17492 j:"
assignees:
- btangmu
- srl295
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/auto-author-assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# .github/workflows/auto-author-assign.yml
name: Auto Author Assign

on:
pull_request_target:
types: [ opened, reopened ]

permissions:
pull-requests: write

jobs:
assign-author:
runs-on: ubuntu-latest
steps:
- uses: toshimaru/[email protected]
22 changes: 11 additions & 11 deletions .github/workflows/build-icu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
java-version: 11
distribution: 'temurin'
- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('tools/**/pom.xml') }}
Expand All @@ -51,7 +51,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload cldr-code
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cldr-code
path: tools/cldr-code/target/cldr-code.jar
Expand All @@ -66,7 +66,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload cldr-prod
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cldr-prod
path: target/cldr-prod.zip
Expand All @@ -77,13 +77,13 @@ jobs:
steps:
- name: Download CLDR Production Artifact
id: downloadprod
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: cldr-prod
path: .
- name: Download CLDR tools
id: downloadtools
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: cldr-code
path: cldr-code
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
lfs: false # not needed here
path: icu
- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('icu/tools/**/pom.xml') }}
Expand All @@ -154,7 +154,7 @@ jobs:
- name: Zip up icu-data.zip
run: 'cd icu/icu4c/source && zip -rlq ../../../icu-data.zip data'
- name: Upload icu-data.zip
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: icu-data
path: icu-data.zip
Expand All @@ -176,7 +176,7 @@ jobs:
ref: ${{ github.event.inputs.icu-ref }}
lfs: false
- name: Download icu-data.zip
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: icu-data
path: .
Expand All @@ -194,7 +194,7 @@ jobs:
make -j 2;
make dist
- name: Upload icu4c
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: icu4c
path: icu4c/source/dist
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
- name: Checkout lfs objects
run: git lfs pull
- name: Download icu-data.zip
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: icu-data
path: .
Expand All @@ -241,7 +241,7 @@ jobs:
ant jar;
ant releaseBinaries;
- name: Upload icu4j
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: icu4j
path: icu4j/release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ jobs:
distribution: 'temurin'
- name: Cache local Maven repository
if: matrix.language == 'java'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('tools/**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Cache local npm repository
if: matrix.language == 'javascript'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commit-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
# the ~/.ssh/known_hosts line mentioning SMOKETEST_HOST
CCC_KNOWNHOSTS: ${{ secrets.CCC_KNOWNHOSTS }}
- name: Upload CLDR_REPORT.md
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: commit-checker-report
path: CLDR_REPORT.md
40 changes: 25 additions & 15 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@

name: Publish to gh-pages

permissions:
pages: write
deployments: write
id-token: write

on:
push:
branches:
Expand All @@ -20,7 +26,7 @@ jobs:
with:
lfs: false
- name: Cache local npm repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-nodetr-${{ hashFiles('tools/scripts/tr-archive/package-lock.json') }}
Expand All @@ -32,9 +38,9 @@ jobs:
# Note: will update ToC if out of date
run: 'cd tools/scripts/tr-archive/ && npm ci && npm run build'
- name: Run Kbd Charts
run: 'cd docs/charts/keyboard && npm ci && npm run build'
run: 'cd docs/charts/keyboards && npm ci && npm run build'
- name: Upload tr35.zip
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: tr35-spec
path: tools/scripts/tr-archive/tr35.zip
Expand All @@ -43,7 +49,7 @@ jobs:
run: 'cd tools/scripts/tr-archive/ && npm run extract-link-targets || (echo Warning, please fix these ; true)'
- name: Lint Markdown
# Warn, don't fail yet
run: npx markdownlint-cli *.md {specs,docs}/*.md $(find .github -name '*.md') || (echo Warning, please fix these ; true)
run: npx markdownlint-cli *.md {specs,docs}/*.md || (echo Warning, please fix these ; true)
- name: Note any changes
run: git status ; git diff
- uses: ruby/setup-ruby@v1
Expand All @@ -53,22 +59,16 @@ jobs:
- name: Build Jekyll part of the site
run: |
gem install bundler github-pages kramdown-parser-gfm # should pull in jekyll, etc.
jekyll build -s docs -d _site
cd docs && github-pages build && mkdir -vp ../_site/ldml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Rearrange stuff
run: 'cp -vr tools/scripts/tr-archive/dist/* ./_site/ldml/ && cp tools/scripts/tr-archive/reports-v2.css ./_site/'
- name: Deploy to GitHub Pages (main)
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: Cecilapp/GitHub-Pages-deploy@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
# email: [email protected]
build_dir: _site # optional
branch: gh-pages # optional
# cname: domain.tld # optional
# jekyll: no # optional
commit_message: CLDR-00000 Automated Build of Pages # optional
uses: actions/upload-pages-artifact@v2
- name: Deploy to Smoketest
if: github.repository == 'unicode-org/cldr'
shell: bash
env:
RSA_KEY_CCC: ${{ secrets.RSA_KEY_CCC }}
Expand All @@ -86,6 +86,16 @@ jobs:
rsync -cav --delete-after -e "ssh -o UserKnownHostsFile=${HOME}/.knownhosts -i ${HOME}/.key -p ${CCC_PORT}" ./_site/ ${CCC_USER}@${CCC_HOST}:spec/$(basename ${GITHUB_REF_NAME})/
echo "::endgroup::"
echo "Now go to https://cldr-smoke.unicode.org/spec/"$(basename ${GITHUB_REF_NAME})
deploy:
environment:
name: github-pages
url: ${{steps.deployment.outputs.page_url}}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2

# only run one of these at a time
concurrency:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
lfs: false # not needed for this job, as we don’t currently do a Java build
- uses: nodenv/actions/node-version@v3 # setup using .node-version
- name: Cache webpack
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: tools/cldr-apps/target/webpack_cache
key: ${{ runner.os }}-webpack-${{ hashFiles('tools/cldr-apps/package*') }}-${{ hashFiles('tools/cldr-apps/src/**') }}
restore-keys: |
${{ runner.os }}-webpack-
webpack-
- name: Cache npm repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-lint-${{ hashFiles('.github/workflows/js.yml') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/keyboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ jobs:
ref: ${{ github.event.inputs.git-ref }}
if: github.event.inputs.git-ref != ''
- name: Cache local npm repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-nodekbd-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-nodekbd-
nodekbd-
- name: Install kmc
run: npm install -g @keymanapp/kmc@beta
run: npm install -g @keymanapp/kmc@alpha
- name: Compile Keyboards
run: kmc --error-reporting build keyboards/3.0/*.xml
- name: Run Kbd Charts
run: 'cd docs/charts/keyboard && npm ci && npm run build'
run: 'cd docs/charts/keyboards && npm ci && npm run build'
16 changes: 15 additions & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,27 @@ jobs:
mvn-deploy:
runs-on: ubuntu-latest
steps:
# since we have to checkout all branches, cache here
- name: Cache .git
uses: actions/cache@v4
with:
path: .git
key: git-${{ github.base_ref }}-${{ github.sha }}
restore-keys: |
git-${{ github.base_ref }}-${{ github.sha }}
git-${{ github.base_ref }}
git-
- uses: actions/checkout@v4
with:
lfs: false
fetch-depth: 0 # for cldr-archive
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('tools/**/pom.xml') }}
Expand All @@ -28,6 +39,9 @@ jobs:
-DskipTests=true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout CLDR archive
run: >
mkdir -v ../cldr-archive && java -jar tools/cldr-code/target/cldr-code.jar checkout-archive
- name: set version to generic number
run: |
mvn -s .github/workflows/mvn-settings.xml --file tools/pom.xml versions:set -DnewVersion=0.0.0-SNAPSHOT-$(echo ${GITHUB_SHA} | cut -c1-10)
Expand Down
Loading

0 comments on commit d4ee48e

Please sign in to comment.