Skip to content

Commit f9b1162

Browse files
committed
CLDR-17918 build: use mvn settings from CLDR
- piggyback on cldr/.github/workflows/mvn-settings.xml for building - add MVN_OPTS variable in the json build script
1 parent b9b1a24 commit f9b1162

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/build-json.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
rm -rf cldr-json
8888
echo "::endgroup::"
8989
echo "::group::Build"
90-
bash cldr-generate-json.sh
90+
bash MVN_OPTS="-s cldr/.github/workflows/mvn-settings.xml" cldr-generate-json.sh
9191
echo "::endgroup::"
9292
echo "::group::Status"
9393
git status || true

cldr-generate-json.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
mkdir -p -v ${OUT} ${INDATA}/seed/main ${INDATA}/seed/annotations ${DIST}
2323
MAIN_CLASS=org.unicode.cldr.json.Ldml2JsonConverter
2424
export MAVEN_OPTS="-Xmx16384m -Dexec.cleanupDaemonThreads=false -Dexec.mainClass=${MAIN_CLASS}"
25-
MVN="mvn --file=${CLDR_DIR}/tools/pom.xml -pl cldr-code"
25+
MVN="mvn ${MVN_OPTS} --file=${CLDR_DIR}/tools/pom.xml -pl cldr-code"
2626
MVN_COMPILE="${MVN} compile"
2727
MVN_EXEC="${MVN} -DCLDR_DIR=${INDATA} exec:java"
2828

0 commit comments

Comments
 (0)