meow

unicode-org · Jun 5, 2024 · 5b27532 · 5b27532
1 parent 140ab5c
commit 5b27532
Showing 1 changed file with 2 additions and 20 deletions.
diff --git a/.github/workflows/cli-build-instructions.yml b/.github/workflows/cli-build-instructions.yml
@@ -275,21 +275,6 @@ jobs:
         with:
           repository: unicode-org/unicodetools
           path: unicodetools/mine/src
-      - name: Checkout base UnicodeData.txt
-        if: ${{ github.event_name == 'pull_request'}}
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.base.sha }}
-          path: base
-          sparse-checkout: unicodetools/data/ucd/dev/UnicodeData.txt
-      - name: Compare repertoire
-        if: ${{ github.event_name == 'pull_request'}}
-        run: |
-          # Look for changes affecting the first two fields of UnicodeData.txt (code point and name).
-          sed 's/^\([^;]*;[^;]*\);.*$/\1/' unicodetools/mine/src/unicodetools/data/ucd/dev/UnicodeData.txt > merged-repertoire.txt
-          sed 's/^\([^;]*;[^;]*\);.*$/\1/' base/unicodetools/data/ucd/dev/UnicodeData.txt > base-repertoire.txt
-          diff base-repertoire.txt merged-repertoire.txt
-          echo "REPERTOIRE_CHANGED=$?" >> "$GITHUB_ENV"
       - name: Get the CLDR_REF from pom.xml
         id: cldr_ref
         run: echo "CLDR_REF="$(mvn --file unicodetools/mine/src/pom.xml help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) >> $GITHUB_OUTPUT && cat ${GITHUB_OUTPUT}
@@ -335,10 +320,6 @@ jobs:
           mvn -s .github/workflows/mvn-settings.xml compile exec:java -Dexec.mainClass="org.unicode.text.UCA.Main"  -Dexec.args="writeCollationValidityLog ICU" -am -pl unicodetools  -DCLDR_DIR=$(cd ../../../cldr/mine/src ; pwd)  -DUNICODETOOLS_GEN_DIR=$(cd ../Generated ; pwd)  -DUNICODETOOLS_REPO_DIR=$(pwd)  -DUVERSION=$CURRENT_UVERSION
           # check for output file
           compgen -G "../Generated/UCA/*/CheckCollationValidity.html"
-          if [[ $REPERTOIRE_CHANGED -ne 0 ]]
-          then exit 0
-          else exit $?
-          fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -411,9 +392,10 @@ jobs:
           else ERROR="::notice"
           fi
           MAVEN_OPTS="-ea" mvn -s .github/workflows/mvn-settings.xml test -am -pl unicodetools -Dtest=TestTestUnicodeInvariants#testSecurityInvariants -DCLDR_DIR=$(cd ../../../cldr/mine/src ; pwd)  -DUNICODETOOLS_GEN_DIR=$(cd ../Generated ; pwd)  -DUNICODETOOLS_REPO_DIR=$(pwd)  -DUVERSION=$CURRENT_UVERSION -DfailIfNoTests=false -DEMIT_GITHUB_ERRORS | sed "s/^::error/$ERROR/"
+          STATUS=$?
           if [[ $REPERTOIRE_CHANGED -ne 0 ]]
           then exit 0
-          else exit $?
+          else exit $STATUS
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}