Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs(jsp): update docs concerning GCR #556 #621

Merged
merged 2 commits into from
Dec 9, 2023
Merged

docs(jsp): update docs concerning GCR #556 #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
486d827
docs: #556
srl295 Dec 7, 2023
a5f7d41
docs: #556
srl295 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/unicodejsps/gcp-run.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
```

Expand Down
20 changes: 12 additions & 8 deletions docs/unicodejsps/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand All @@ -192,9 +196,9 @@ Unicode Tools.
the new revision takes over traffic.
5. Check
1. Test the new deployment at
<https://unicode-jsps-staging-5ocgitonaa-uw.a.run.app>
<https://unicode-jsps-staging-o2ookmn2oq-uc.a.run.app>
2. To check new characters (for example):
<https://unicode-jsps-staging-5ocgitonaa-uw.a.run.app/UnicodeJsps/list-unicodeset.jsp?a=\p{age=8.0}-\p{age=7.0}>
<https://unicode-jsps-staging-o2ookmn2oq-uc.a.run.app/UnicodeJsps/list-unicodeset.jsp?a=\p{age=8.0}-\p{age=7.0}>
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:
Expand Down
Loading