From ff335da9bd6fe1ce16de64445bdad387bdcf9f05 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Mon, 15 Nov 2021 14:40:13 -0800 Subject: [PATCH 1/2] chore: cleanup cloud RAD generation Updating cloud rad generation to support [java-shared-config/pull/344](https://github.com/googleapis/java-shared-config/pull/344) updates and removing inclusion of README as we're not currently supporting this feature yet Source-Author: Emily Ball Source-Date: Mon Nov 8 13:23:34 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 99ea92a109dbcd4e2b8c179e337848ba6a25fe16 Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16 --- .kokoro/release/publish_javadoc11.sh | 10 +++------- synth.metadata | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 078c71bc7..bce045ecd 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-compute export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/synth.metadata b/synth.metadata index 71e210026..470997e7a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-compute.git", - "sha": "6960101aa546f4456bfafde0a265beb16079a734" + "sha": "8c2e39c36f81e5238538b1471dd16d942c5e8da6" } }, { @@ -18,7 +18,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "717a6a1fe247df095092de1321eadc9da887a06c" + "sha": "99ea92a109dbcd4e2b8c179e337848ba6a25fe16" } } ], From 07d4736f94f586df1e4cfe77b8a6f9de8b290ef2 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Mon, 15 Nov 2021 14:40:13 -0800 Subject: [PATCH 2/2] chore: update jre to 11 for linter java-format requires JRE v11+ to run linter. It still check older code, just jre has to be 11+: https://github.com/google/google-java-format/issues/529 Updating ci.yaml template since it is applicable for all the libraries. Source-Author: Timur Sadykov Source-Date: Tue Nov 9 01:52:34 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 42a3786737c17ece39924d7025f3be481812da53 Source-Link: https://github.com/googleapis/synthtool/commit/42a3786737c17ece39924d7025f3be481812da53 --- .github/workflows/ci.yaml | 2 +- synth.metadata | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c62..05de1f60d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: diff --git a/synth.metadata b/synth.metadata index 470997e7a..df6b63aa3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -18,7 +18,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "99ea92a109dbcd4e2b8c179e337848ba6a25fe16" + "sha": "42a3786737c17ece39924d7025f3be481812da53" } } ],