Merge remote-tracking branch 'la-vache/main' into bengali-sign-combining-anusvara-above

Author: eggrobin

.github/ISSUE_TEMPLATE/unicodedata.md

@@ -0,0 +1,14 @@
+---
+name: Feedback on Unicode data, properties, algorithms
+about: Not for reporting bugs or suggestions
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Members of UTC/PAG and other Unicoders with access
+Please submit an issue in the Unicode-internal PAG repo.
+
+## Otherwise
+Please submit feedback via https://www.unicode.org/reporting.html

.github/ISSUE_TEMPLATE/unicodetools.md

@@ -0,0 +1,13 @@
+---
+name: Feedback on the internal Unicode Tools code and processes
+about: Internal tools used by UTC/PAG
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+(Bugs, suggestions, ideas for internal Unicode Tools code, for its maintainers, their processes, etc.)
+
+(These tools are public and open source but not public deliverables. They are used internally by Unicode maintainers.
+Data is published at https://www.unicode.org/Public/ -- feedback: https://www.unicode.org/reporting.html)

.github/workflows/build-jsp.yml

@@ -1,35 +1,42 @@
 name: Build JSP
 
 env:
-  CURRENT_UVERSION: 17.0.0 # FIX_FOR_NEW_VERSION
-  PREVIOUS_UVERSION: 16.0.0  # not used at present
+  CURRENT_UVERSION: 18.0.0 # FIX_FOR_NEW_VERSION
+  PREVIOUS_UVERSION: 17.0.0  # not used at present
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 on:
-  push:
-    branches:
-    - '*'
   pull_request:
     branches:
     - '*'
+  push:
+    tags:
+    - '*'
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - 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 repository
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: cldr
         key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
         restore-keys: |
           cldr
     - name: Check out CLDR
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: unicode-org/cldr
         path: cldr
@@ -45,12 +52,16 @@ jobs:
       with:
         java-version: 11
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+    - name: Fetch Last Resort Font
+      run: |
+        wget https://github.com/unicode-org/last-resort-font/releases/latest/download/LastResort-Regular.ttf
+        mv ./LastResort-Regular.ttf ./UnicodeJsps/src/main/webapp/
     # TODO: move this DOWN after JSPs once it works
     - name: Regenerate the property cache files
       run: >
@@ -69,10 +80,46 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload UnicodeJsps.war
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: UnicodeJsps
         path: UnicodeJsps/target/UnicodeJsps.war
-    - name: build docker image
-      run: cd UnicodeJsps && bash update-bidic-ucd.sh && docker build .
-
+    - name: Build C Bidi
+      run: cd UnicodeJsps && bash update-bidic-ucd.sh
+    - name: Log in to the Container registry
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+    - name: Build and push Docker image
+      if: github.event_name != 'pull_request'
+      id: push
+      uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      with:
+        context: UnicodeJsps/
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+    - name: Build and Docker image (PR)
+      if: github.event_name == 'pull_request'
+      id: builddocker
+      uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      with:
+        context: UnicodeJsps/
+        push: false
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+    - name: Generate artifact attestation
+      if: github.event_name != 'pull_request'
+      uses: actions/attest-build-provenance@v2
+      with:
+        subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+        subject-digest: ${{ steps.push.outputs.digest }}
+        push-to-registry: true

.github/workflows/cache_retain.yml

@@ -30,6 +30,10 @@ jobs:
   retain-maven-cache:
     name: Run all tests with Maven
     runs-on: ubuntu-latest
+    # Only run this on the upstream repo. Otherwise, running in a personal fork will cause
+    # Github to disable the personal fork copy of the workflow
+    # (Github complains about running a scheduled workflow on a repo with > 60 days of inactivity)
+    if: github.ref == 'refs/heads/main' && github.repository == 'unicode-org/unicodetools'
     steps:
       - name: Checkout and setup
         uses: actions/checkout@v2
@@ -38,7 +42,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

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

@@ -9,8 +9,8 @@ on:
     - '*'
 
 env:
-  CURRENT_UVERSION: 17.0.0  # FIX_FOR_NEW_VERSION
-  PREVIOUS_UVERSION: 16.0.0
+  CURRENT_UVERSION: 18.0.0  # FIX_FOR_NEW_VERSION
+  PREVIOUS_UVERSION: 17.0.0
 
 jobs:
 
@@ -45,7 +45,7 @@ jobs:
       - 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 repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cldr
           key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -71,7 +71,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -113,7 +113,7 @@ jobs:
       - 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 repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cldr/mine/src
           key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -133,7 +133,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -176,7 +176,7 @@ jobs:
 
       - name: Upload UnicodeTestResults artifact
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: unicode-test-results
           path: |
@@ -297,7 +297,7 @@ jobs:
       - 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 repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cldr/mine/src
           key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -317,7 +317,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -375,7 +375,7 @@ jobs:
       - 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 repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cldr/mine/src
           key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -395,7 +395,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/codeql.yml

@@ -27,16 +27,16 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
         if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

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

@@ -18,7 +18,7 @@ jobs:
     - 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
+      uses: actions/cache@v4
       with:
         path: cldr
         key: cldr-${{ steps.cldr_ref.outputs.CLDR_REF }}
@@ -37,7 +37,7 @@ jobs:
       run:
         mkdir -p UnicodeJsps/target && tar -cpz --exclude=.git -f UnicodeJsps/target/cldr-unicodetools.tgz ./cldr ./unicodetools
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -49,7 +49,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload UnicodeJsps.war
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: UnicodeJsps
         path: UnicodeJsps/target/UnicodeJsps.war

.gitignore

@@ -43,6 +43,7 @@ perf-*.xml
 test-*.xml
 
 # Directories
+.idea/
 .settings/
 .vs/
 .vscode/

README.md

@@ -13,6 +13,10 @@ Some of the documentation still refers to the previous Subversion repository.
 This GitHub repo reflects the svn repo up to r1566,
 plus a few snapshots up to r1830. (Don’t ask.)
 
+### Online Web Tools
+
+This repository includes the source for the tooling at <https://util.unicode.org> - see [`/UnicodeJsps`](./UnicodeJsps/README.md)
+
 ### Bug reports
 
 For feedback on the Unicode Standard and bug reports against the Unicode Character Database,
@@ -23,7 +27,7 @@ The tools maintainers use GH issues for issues with the code in this repo.
 
 ### Copyright & Licenses
 
-Copyright © 2001-2024 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries.
+Copyright © 2001-2025 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries.
 
 A CLA is required to contribute to this project - please refer to the [CONTRIBUTING.md](https://github.com/unicode-org/.github/blob/main/.github/CONTRIBUTING.md) file (or start a Pull Request) for more information.
 

UnicodeJsps/Dockerfile

@@ -3,7 +3,8 @@ FROM alpine as cbuild
 WORKDIR /build
 RUN apk add --update wget make gcc musl-dev
 ARG CPATH=https://www.unicode.org/Public/PROGRAMS/BidiReferenceC/
-ARG CVERSION=15.1.0
+# FIX_FOR_NEW_VERSION
+ARG CVERSION=16.0.0
 RUN wget -np -nv --reject-regex='.*\.(lib|exe)$' --cut-dirs=4 -nH -r ${CPATH}${CVERSION}/
 RUN cd source && gcc -I ../include/ -static -Os -o3 -o bidiref1 bidiref1.c brutils.c brtest.c brtable.c brrule.c
 RUN ls -lh /build/source/bidiref1 && (/build/source/bidiref1 || true)