Merge branch 'main' into plural-samples-fixdec-to-decquant

unicode-org · Aug 11, 2022 · 6578f07 · 6578f07
2 parents bd79076 + 2b1cba5
commit 6578f07
Show file tree

Hide file tree

Showing 1,060 changed files with 744,681 additions and 538,256 deletions.
diff --git a/.github/COMMIT_METADATA.md b/.github/COMMIT_METADATA.md
@@ -0,0 +1,32 @@
+# Commit Metadata
+
+### These lines are comments.
+### 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>`
+
+- 00decafbad CLDR-0000 Bad commit message
+- 50257a7a3eba7bbed634961a2aa74e77b12810bf - Early commit, no bug id
+- 283dc84d81cfc47fb15cd664fce4b0151d070ea6 - Early commit, no bug id
+- 02198373a591a15b804127acddd32582ec985b7e CLDR-15852 v42 merge commit
+- 9e15f63e30cadf57b8eee0f6d6c3398263dfcdac CLDR-15470 v41 cherry pick
+
+### 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)
+### Note: if something is both to be skipped AND has a bad commit message, add it to this file twice: once in the skip list, and once in the corrections section at the top.
+
+# SKIP v41
+
+- 56ca5d5 CLDR-14877 split ticket
+- 56ca5d563cf57990a7598f570cb9be51956cb9de - v40 commit
+- 382f36702d763713f010a3bf87d34605c0226ebd - v40 commit
+- bc8a79f9b1b71b00c716b8b4c8e0185515a6d0b8 - v40 commit
+- 4b87f2d718dd9cab45517ebe7f996ac10b6b1fff - v40 commit
+
+# SKIP v42
+- f86c67b CLDR-15290 v41 spec
+- 0eace83 CLDR-15115 v41 spec
+- 5aca9fd CLDR-15398 v41 spec
+- bbffc61 CLDR-15408 v41 spec
+- 953c013 CLDR-15461 v41 BRS
+- 1b84c52 CLDR-15461 v41 BRS
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,63 @@
+# Docs: https://docs.github.com/en/code-security/dependabot
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    commit-message:
+      include: scope
+      prefix: "CLDR-15539 gh:"
+    assignees:
+      - btangmu
+      - srl295
+    reviewers:
+      - btangmu
+      - srl295
+
+  # Maintain dependencies for npm
+  - package-ecosystem: "npm"
+    directory: "/tools/cldr-apps/js"
+    schedule:
+      interval: "monthly"
+    commit-message:
+      include: scope
+      prefix: "CLDR-15539 js:"
+    assignees:
+      - btangmu
+      - srl295
+    reviewers:
+      - btangmu
+      - srl295
+
+  - package-ecosystem: "npm"
+    directory: "/tools/scripts/tr-archive"
+    schedule:
+      interval: "monthly"
+    commit-message:
+      include: scope
+      prefix: "CLDR-15539 tr:"
+    assignees:
+      - btangmu
+      - srl295
+    reviewers:
+      - btangmu
+      - srl295
+
+  # Maintain dependencies for Maven
+  - package-ecosystem: "maven"
+    directory: "/tools"
+    schedule:
+      interval: "monthly"
+    commit-message:
+      include: scope
+      prefix: "CLDR-15539 j:"
+    assignees:
+      - btangmu
+      - srl295
+    reviewers:
+      - btangmu
+      - srl295
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
@@ -1,44 +1,33 @@
 name: Ansible Lint
 
-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - 'tools/scripts/ansible/**'
+      - '.github/workflows/ansible-lint.yml'
+  pull_request:
+    paths:
+      - 'tools/scripts/ansible/**'
+      - '.github/workflows/ansible-lint.yml'
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         lfs: false # not needed for this job, as we don’t currently do a Java build
     - name: Lint Ansible Playbook
       # the hash here is a specific version of that repo
-      uses: ansible/ansible-lint-action@c37fb7b4bda2c8cb18f4942716bae9f11b0dc9bc
+      uses: ansible/ansible-lint-action@c00ea1b2ac047eaf7318275ac83a0cb846cea71a
       with:
         targets: tools/scripts/ansible/*-playbook.yml
         override-deps: |
           rich>=9.5.1,<11.0.0
-    - name: Cache lint npm repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-lint-${{ hashFiles('.github/workflows/ansible-lint.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-lint-
-          lint-
-    - 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)
-    - name: Lint GitHub Actions
-      run: npx yaml-lint .github/workflows/*.yml
-    - name: Prepare JS tests
-      run: (cd tools/cldr-apps/js && npm ci)
-    - name: Run JS tests
-      # stopgap: fail this if it takes too long
-      timeout-minutes: 10
-      run: (cd tools/cldr-apps/js && npm t)
-  build:
+  testprovision:
     runs-on: macos-10.15  # see https://github.com/actions/virtual-environments/issues/4060
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         lfs: false # not needed for this job, as we don’t currently do a Java build
     - name: Install Vagrant and Ansible

diff --git a/.github/workflows/build-icu.yml b/.github/workflows/build-icu.yml
@@ -27,17 +27,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone CLDR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.cldr-ref }}
           lfs: false
           repository: ${{ github.event.inputs.cldr-repo }}
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'temurin'
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('tools/**/pom.xml') }}
@@ -50,7 +51,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload cldr-code
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: cldr-code
           path: tools/cldr-code/target/cldr-code.jar
@@ -65,7 +66,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload cldr-prod
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: cldr-prod
           path: target/cldr-prod.zip
@@ -76,22 +77,23 @@ jobs:
     steps:
       - name: Download CLDR Production Artifact
         id: downloadprod
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: cldr-prod
           path: .
       - name: Download CLDR tools
         id: downloadtools
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: cldr-code
           path: cldr-code
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'temurin'
       - name: Setup Maven Settings
-        uses: s4u/maven-settings-action@v2.4.1
+        uses: s4u/maven-settings-action@v2.6.0
         with:
           servers: |
             [{
@@ -111,21 +113,21 @@ jobs:
         run: mkdir -p cldr cldr-prod && cd cldr-prod && unzip ../cldr-prod.zip
       # Don't actually need CLDR
       # - name: Clone CLDR
-      #   uses: actions/checkout@v2
+      #   uses: actions/checkout@v3
       #   with:
       #     ref: ${{ github.event.inputs.cldr-ref }}
       #     lfs: false
       #     repository: ${{ github.event.inputs.cldr-repo }}
       #     path: cldr
       - name: Clone ICU
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ github.event.inputs.icu-repo }}
           ref: ${{ github.event.inputs.icu-ref }}
           lfs: false # not needed here
           path: icu
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('icu/tools/**/pom.xml') }}
@@ -152,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@v2
+        uses: actions/upload-artifact@v3
         with:
           name: icu-data
           path: icu-data.zip
@@ -168,13 +170,13 @@ jobs:
     needs: genicudata
     steps:
       - name: Clone ICU
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ github.event.inputs.icu-repo }}
           ref: ${{ github.event.inputs.icu-ref }}
           lfs: false
       - name: Download icu-data.zip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: icu-data
           path: .
@@ -192,7 +194,7 @@ jobs:
           make -j 2;
           make dist
       - name: Upload icu4c
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: icu4c
           path: icu4c/source/dist
@@ -212,33 +214,34 @@ jobs:
     needs: genicudata
     steps:
       - name: Clone ICU
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ github.event.inputs.icu-repo }}
           ref: ${{ github.event.inputs.icu-ref }}
           lfs: true
       - name: Checkout lfs objects
         run: git lfs pull
       - name: Download icu-data.zip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: icu-data
           path: .
       - name: Unpack icu-data.zip
         run: cd icu4c/source && rm -rf data && unzip -o ../../icu-data.zip
       - name: Generate ICU4J data
         run: cd icu4c/source && ./runConfigureICU Linux && make -j2 && make -C data icu4j-data-install ICU4J_ROOT=$(cd ../../icu4j ; pwd)
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: '16'
+          java-version: '16' # For ICU4J
+          distribution: 'temurin'
       - name: ICU4J Build
         run: |
           cd icu4j;
           ant init;
           ant jar;
           ant releaseBinaries;
       - name: Upload icu4j
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: icu4j
           path: icu4j/release