From 486d827a3c24a892cab619c237fbac43f6680e58 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 7 Dec 2023 16:26:11 -0600 Subject: [PATCH 1/2] docs: #556 - improvement to gcp build docs --- docs/unicodejsps/gcp-run.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/unicodejsps/gcp-run.md b/docs/unicodejsps/gcp-run.md index 90eaa8bdc..fcb79cfb8 100644 --- a/docs/unicodejsps/gcp-run.md +++ b/docs/unicodejsps/gcp-run.md @@ -12,10 +12,12 @@ mvn -B package -am -pl UnicodeJsps -DskipTests=true ``` -- make a copy of CLDR - lots of ways to do this +- make a copy of CLDR - lots of ways to do this. `--reference-if-able ~/src/cldr` is another directory on my disk which has a copy of CLDR, to save copying. The CLDR_REF calculation is to make sure you have the same CLDR version as the build. ``` -git clone --reference-if-able ~/src/cldr https://github.com/unicode-org/cldr.git +git clone https://github.com/unicode-org/cldr.git --reference-if-able ~/src/cldr +CLDR_REF=$(mvn help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) +(cd cldr ; git reset --hard ${CLDR_REF}) mkdir -p UnicodeJsps/target && tar -cpz --exclude=.git -f UnicodeJsps/target/cldr-unicodetools.tgz ./cldr/ ./unicodetools/ ``` From a5f7d412aceba293daf1d1585e81843735440ef8 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 8 Dec 2023 12:19:14 -0600 Subject: [PATCH 2/2] docs: #556 - update URLs --- docs/unicodejsps/index.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/unicodejsps/index.md b/docs/unicodejsps/index.md index c3d97f27c..88c7391a9 100644 --- a/docs/unicodejsps/index.md +++ b/docs/unicodejsps/index.md @@ -1,6 +1,6 @@ # Building UnicodeJsp -- Note 2: there are some notes on updated processes for using GCP at [gcp-run.md](./gcp-run.md) - at present, automated deployment is TODO. +- Note 2: there are some notes on updated processes for using GCP at [gcp-run.md](./gcp-run.md) - at present, automated deployment is being worked on. ## Compiling ### Prerequisites @@ -113,10 +113,14 @@ compile java stuff - `mvn -B package -am -pl UnicodeJsps -DskipTests=true` -”backup” copy of CLDR and UnicodeTools. (`~/src/cldr` is an optional existing CLDR dir to save a few packets) +- make a copy of CLDR - lots of ways to do this. `--reference-if-able ~/src/cldr` is another directory on my disk which has a copy of CLDR, to save copying. The CLDR_REF calculation is to make sure you have the same CLDR version as the build. -- `git clone --reference-if-able ~/src/cldr https://github.com/unicode-org/cldr.git || (cd cldr && git pull)` -- `mkdir -p UnicodeJsps/target && tar -cpz --exclude=.git --exclude=unicodetools/target/ -f UnicodeJsps/target/cldr-unicodetools.tgz ./cldr/ ./unicodetools/` +``` +git clone https://github.com/unicode-org/cldr.git --reference-if-able ~/src/cldr +CLDR_REF=$(mvn help:evaluate -Dexpression=cldr.version -q -DforceStdout | cut -d- -f3) +(cd cldr ; git reset --hard ${CLDR_REF}) +mkdir -p UnicodeJsps/target && tar -cpz --exclude=.git -f UnicodeJsps/target/cldr-unicodetools.tgz ./cldr/ ./unicodetools/ +``` Now, finally build. @@ -167,7 +171,7 @@ Unicode Tools. and "test4" ) 4. Now, login to https://console.cloud.google.com/ with your unicode.org account - 1. At the top of the page, switch the project to Unicode Dev Infra\ + 1. At the top of the page, switch the project to [`goog-unicode-dev`](https://console.cloud.google.com/run?project=goog-unicode-dev) ![choose a deployment](chooseimage.png) 2. From the left nav / hamburger menu, find "Cloud Run". Click on the link for the service "**unicode-jsps-staging**". This way @@ -179,7 +183,7 @@ Unicode Tools. ![Google Cloud Run Image Selection Page](CLDR-14145-processb.png) 2. Click Select - 3. expand the "us.gcr.io/dev-infra…/unicode-jsps" images + 3. expand the "us-central1-docker.pkg.dev/goog-unicode-dev/unicode-jsps" images 4. You should see the release tags (test3, test4) show up as "images". 5. Choose the image that corresponds with your deployment (such as **2020-09-15-release**) - the full title may not show up. @@ -192,9 +196,9 @@ Unicode Tools. the new revision takes over traffic. 5. Check 1. Test the new deployment at - + 2. To check new characters (for example): - + 3. Check at the bottom for the right Unicode and ICU versions. 4. Click once on each top link to do simple sanity check. 5. Once that's successful then: