Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into v46
Browse files Browse the repository at this point in the history
  • Loading branch information
srl295 committed Oct 23, 2024
2 parents e345b60 + fb306a7 commit 27525d9
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 3 deletions.
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
commit-message:
include: scope
prefix: "CLDR-00000 deps"
108 changes: 108 additions & 0 deletions .github/workflows/build-json.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: build-json

on:
workflow_dispatch:
inputs:
git-ref:
description: Git Ref to build (Optional)
required: false
version:
description: Package Version (e.g. 46.0.0 or 46.0.0-BETA2 )
required: true
cldr-repo:
description: CLDR (tool) repo to use
required: true
default: 'unicode-org/cldr'
cldr-ref:
description: 'CLDR (tool) ref/tag/branch to use'
required: true
default: 'main'
data-repo:
description: Data (staging) repo to use
required: true
default: 'unicode-org/cldr-staging'
data-ref:
description: 'Data (staging) ref/tag/branch to use'
required: true
default: 'main'
data-dir:
description: 'Path in Data repo'
required: true
default: 'production/'

jobs:
build:
name: Build cldr-json
runs-on: ubuntu-latest
steps:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
- name: Clone json
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.git-ref }}
path: cldr-json
- name: Clone CLDR
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.cldr-ref }}
lfs: false
repository: ${{ github.event.inputs.cldr-repo }}
path: cldr
- name: Cache local Maven repository
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('cldr/tools/**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Clone Data
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.data-ref }}
repository: ${{ github.event.inputs.data-repo }}
sparse-checkout: ${{ github.event.inputs.data-dir }}
path: cldr-staging
- name: Setup Config
run: |
cd cldr-json
echo VERSION=${{ github.event.inputs.version }} > local-config.sh
echo CLDR_DIR=../cldr >> local-config.sh
echo INDATA=../cldr-staging/${{ github.event.inputs.data-dir }} >> local-config.sh
cat local-config.sh
chmod a+rx local-config.sh
bash cldr-identify.sh | tee ../cldr-identity.txt
- name: Upload cldr-identity.txt
uses: actions/upload-artifact@v4
with:
name: cldr-identity
path: ./cldr-identity.txt
- name: Build JSON
run: |
cd cldr-json
echo "::group::Cleanup"
rm -rf cldr-json
echo "::endgroup::"
echo "::group::Build"
env MVN_OPTS="-s ../cldr/.github/workflows/mvn-settings.xml" bash ./cldr-generate-json.sh
echo "::endgroup::"
echo "::group::Status"
git status || true
echo "::endgroup::"
echo "::group::Zip"
bash cldr-generate-zip.sh
cp PACKAGES.md dist/
echo "::endgroup::"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload dist
uses: actions/upload-artifact@v4
with:
name: cldr-json
path: ./cldr-json/dist



4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ the data contained here, please file a new ticket at [Unicode Jira](https://unic

Copyright © 2015-2024 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries.

The project is released under [LICENSE](./LICENSE).
A CLA is required to contribute to this project - please refer to the [CONTRIBUTING.md](./CONTRIBUTING.md) file (or start a Pull Request) for more information.

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.
The contents of this repository are governed by the Unicode [Terms of Use](https://www.unicode.org/copyright.html) and are released under [LICENSE](./LICENSE).
2 changes: 1 addition & 1 deletion cldr-generate-json.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fi
mkdir -p -v ${OUT} ${INDATA}/seed/main ${INDATA}/seed/annotations ${DIST}
MAIN_CLASS=org.unicode.cldr.json.Ldml2JsonConverter
export MAVEN_OPTS="-Xmx16384m -Dexec.cleanupDaemonThreads=false -Dexec.mainClass=${MAIN_CLASS}"
MVN="mvn --file=${CLDR_DIR}/tools/pom.xml -pl cldr-code"
MVN="mvn ${MVN_OPTS} --file=${CLDR_DIR}/tools/pom.xml -pl cldr-code"
MVN_COMPILE="${MVN} compile"
MVN_EXEC="${MVN} -DCLDR_DIR=${INDATA} exec:java"

Expand Down

0 comments on commit 27525d9

Please sign in to comment.