From 47bbbff1fd4a3f179aa8807008b5d2d9ecf0d474 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 10 Nov 2021 14:28:17 -0800 Subject: [PATCH 1/3] Update ci.yaml Let's let all the unit tests complete for now. Java 17 isn't quite ready. Source-Author: Les Vogel Source-Date: Fri Nov 5 11:31:10 2021 -1000 Source-Repo: googleapis/synthtool Source-Sha: 717a6a1fe247df095092de1321eadc9da887a06c Source-Link: https://github.com/googleapis/synthtool/commit/717a6a1fe247df095092de1321eadc9da887a06c --- .github/workflows/ci.yaml | 3 ++- synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d95a11a2..93b337c6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: @@ -68,4 +69,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/synth.metadata b/synth.metadata index 9a79b067..7a3163e8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-common-protos.git", - "sha": "a561b16a28c820e91c7780de8ac2b9c1be49c2bb" + "sha": "9538fca854728674b7647b8e03283c441392cb15" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "79d7936da1cf04ce1b4ead7d2c10dccccd852caf" + "sha": "717a6a1fe247df095092de1321eadc9da887a06c" } } ], From 041d6bb438eace91c677f4a27b58644822eab954 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 10 Nov 2021 14:28:48 -0800 Subject: [PATCH 2/3] 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 | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 20d27393..cb645bfd 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=proto-google-common-protos 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 7a3163e8..99caaacb 100644 --- a/synth.metadata +++ b/synth.metadata @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "717a6a1fe247df095092de1321eadc9da887a06c" + "sha": "99ea92a109dbcd4e2b8c179e337848ba6a25fe16" } } ], From 381244d9dda665ad72776c5eda06970482da2efc Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 10 Nov 2021 14:29:19 -0800 Subject: [PATCH 3/3] 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 93b337c6..05de1f60 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 99caaacb..126fb0f5 100644 --- a/synth.metadata +++ b/synth.metadata @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "99ea92a109dbcd4e2b8c179e337848ba6a25fe16" + "sha": "42a3786737c17ece39924d7025f3be481812da53" } } ],