fix(build): use cldr.version for cldr

- more hyphen vs underscore

Fixes #316

Author: srl295

.github/workflows/build-jsp.yml

@@ -20,13 +20,13 @@ jobs:
       id: cldr_ref
       run: echo "CLDR_REF="$(mvn help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) >> $GITHUB_OUTPUT && cat ${GITHUB_OUTPUT}
     - name: Verify CLDR checkout ref
-      run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr-ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
+      run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
     - name: Check out CLDR
-      uses: actions/checkout@v2
+      uses: actions/checkout@v1  # yes, v1 due to https://github.com/actions/checkout/issues/265
       with:
         repository: unicode-org/cldr
         path: cldr
-        ref: ${{ steps.cldr-ref.outputs.CLDR_REF }}
+        ref: ${{ steps.cldr_ref.outputs.CLDR_REF }}
     - name: Backup Unicodetools and CLDR for jsps  # this is needed only for the Docker build
       run:
         mkdir -p UnicodeJsps/target && tar cfpz UnicodeJsps/target/cldr-unicodetools.tgz ./cldr ./unicodetools

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

@@ -39,11 +39,17 @@ jobs:
     steps:
       - name: Checkout Unicode Tools
         uses: actions/checkout@v3
+      - name: Get the CLDR_REF from pom.xml
+        id: cldr_ref
+        run: echo "CLDR_REF="$(mvn help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) >> $GITHUB_OUTPUT && cat ${GITHUB_OUTPUT}
+      - name: Verify CLDR checkout ref
+        run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
       - name: Check out CLDR
         uses: actions/checkout@v3
         with:
           repository: unicode-org/cldr
           path: cldr
+          ref: ${{ steps.cldr_ref.outputs.CLDR_REF }}
       - name: Move CLDR working copy to be sibling of Unicode Tools
         run: |
           mv cldr ..
@@ -198,7 +204,7 @@ jobs:
             exit 1
           fi
           # TODO(#100): Note: when running locally on a clean checkout, this command
-          # leaves a change in UcdPropertyValues.java by not preserving the comment 
+          # leaves a change in UcdPropertyValues.java by not preserving the comment
           # about the fake Unicode version 13.1.
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -222,7 +228,7 @@ jobs:
           mvn -s .github/workflows/mvn-settings.xml compile exec:java -Dexec.mainClass="org.unicode.draft.GenerateUnihanCollators"  -Dexec.args="" -am -pl unicodetools  -DCLDR_DIR=$(cd ../../../cldr/mine/src ; pwd)  -DUNICODETOOLS_GEN_DIR=$(cd ../Generated ; pwd)  -DUNICODETOOLS_REPO_DIR=$(pwd)  -DUVERSION=$CURRENT_UVERSION
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      
+
       # https://github.com/unicode-org/unicodetools/blob/main/docs/newunicodeproperties.md#checking-other-properties
       - name: Run command - Checking Other Properties
         run: |

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

@@ -7,17 +7,29 @@ jobs:
   build-and-push-to-gcr:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - uses: actions/checkout@v2
+    - name: Get the CLDR_REF from pom.xml
+      id: cldr_ref
+      run: echo "CLDR_REF="$(mvn help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) >> $GITHUB_OUTPUT && cat ${GITHUB_OUTPUT}
+    - name: Verify CLDR checkout ref
+      run: echo CLDR_REF="${{ steps.cldr_ref.outputs.CLDR_REF }}" && [ "${{ steps.cldr_ref.outputs.CLDR_REF }}x" != "x" ] # fail if empty
+    - name: Cache CLDR
+      uses: actions/cache@v2
+      with:
+        path: cldr
+        key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
+        restore-keys: |
+          cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
     - name: Check out CLDR
-      uses: actions/checkout@v2
+      uses: actions/checkout@v1.2  # yes, v1 due to https://github.com/actions/checkout/issues/265
       with:
         repository: unicode-org/cldr
         path: cldr
+        ref: ${{ steps.cldr_ref.outputs.CLDR_REF }}
     - name: Backup Unicodetools and CLDR for jsps
       run:
         mkdir -p UnicodeJsps/target && tar cfpz UnicodeJsps/target/cldr-unicodetools.tgz ./cldr ./unicodetools

.github/workflows/pythonpackage.yml

@@ -18,7 +18,7 @@ jobs:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with: