From 11ce92403f03e20bfc15624640c7db24f83d642f Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 19 Feb 2021 14:18:51 -0800 Subject: [PATCH 1/4] ci: linkage monitor CI job to use build.sh This PR updates the GitHub Actions configuration for Linkage Monitor. Before this change, the CI configuration has "mvn install" command with 6 options. It turned out that a slight difference in the command line option from "build.sh" fails the build in google-auth-library-java repository (https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/1941). (@Neenu1995 found the build failure. Thanks!) Therefore, this change updates the configuration so that Linkage Monitor job just uses "build.sh" to install the artifacts into local Maven repository. # How did I test? I tested this change in java-spanner repository with this draft PR: https://github.com/googleapis/java-spanner/pull/868 Screen Shot 2021-02-12 at 16 54 18 It succeeded. Source-Author: Tomo Suzuki Source-Date: Tue Feb 16 15:56:09 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: f327d3b657a63ae4a8efd7f011a15eacae36b59c Source-Link: https://github.com/googleapis/synthtool/commit/f327d3b657a63ae4a8efd7f011a15eacae36b59c --- .github/workflows/ci.yaml | 13 +++---------- synth.metadata | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98a472e1..def8b3a2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,17 +55,10 @@ jobs: java-version: 8 - run: java -version - name: Install artifacts to local Maven repository - run: | - source .kokoro/common.sh - retry_with_backoff 3 10 \ - mvn install -B -V \ - -Dmaven.test.skip -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true + run: .kokoro/build.sh shell: bash - - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor + - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) + uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/synth.metadata b/synth.metadata index a6fcd327..ae4f33d1 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "048eafee55117aa91ec1c7d039948cd240821588" + "sha": "d9b2d4aab9a9bba1c2df6fcb52ac96ee8b001ad6" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "2414b817065726eae0bc525346c7e874f969369d" + "sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c" } } ], From 28336d2873a26c1bd86e51f7acb98a0811313a79 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 19 Feb 2021 14:18:55 -0800 Subject: [PATCH 2/4] chore: update cloud-rad buckets doclava v2 => staging docFX v3 => prod Source-Author: Emily Ball Source-Date: Tue Feb 16 17:02:08 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: b416a7befcdbc42de41cf387dcf428f894fb812b Source-Link: https://github.com/googleapis/synthtool/commit/b416a7befcdbc42de41cf387dcf428f894fb812b --- .kokoro/release/publish_javadoc.cfg | 4 ++-- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.cfg | 2 +- .kokoro/release/publish_javadoc11.sh | 2 +- synth.metadata | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index f21f268c..0e363fd8 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,10 +7,10 @@ env_vars: { value: "docs-staging" } +# cloud-rad staging env_vars: { key: "STAGING_BUCKET_V2" - value: "docs-staging-v2" - # Production will be at: docs-staging-v2 + value: "docs-staging-v2-staging" } env_vars: { diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index fcbefb71..d2fc3e90 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \ --version ${VERSION} \ --language java -# upload docs +# upload docs to staging bucket python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg index 4864edf0..a0609ba1 100644 --- a/.kokoro/release/publish_javadoc11.cfg +++ b/.kokoro/release/publish_javadoc11.cfg @@ -1,9 +1,9 @@ # Format: //devtools/kokoro/config/proto/build.proto +# cloud-rad production env_vars: { key: "STAGING_BUCKET_V2" value: "docs-staging-v2" - # Production will be at: docs-staging-v2 } # Configure the docker image for kokoro-trampoline diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index a03e5eaf..f5e1d63a 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \ --version ${VERSION} \ --language java -# upload yml +# upload yml to production bucket python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ diff --git a/synth.metadata b/synth.metadata index ae4f33d1..6d226385 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,7 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c" + "sha": "b416a7befcdbc42de41cf387dcf428f894fb812b" } } ], From de6c3064c57463c48aac4caa6e3cbd5984da7fba Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 19 Feb 2021 14:19:07 -0800 Subject: [PATCH 3/4] fix: don't log downloads @chingor13 This change keeps Maven 3.6.1 and later from spamming our CI logs with page after page of lists of artifacts it's downloading that makes it much harder to find the actual test output. Source-Author: Elliotte Rusty Harold Source-Date: Thu Feb 18 19:58:59 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 1aeca92e4a38f47134cb955f52ea76f84f09ff88 Source-Link: https://github.com/googleapis/synthtool/commit/1aeca92e4a38f47134cb955f52ea76f84f09ff88 --- .kokoro/build.sh | 2 ++ synth.metadata | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 97ab43ba..903bd94d 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -60,6 +60,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -81,6 +82,7 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ + -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/synth.metadata b/synth.metadata index 6d226385..ae7111ac 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,7 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "b416a7befcdbc42de41cf387dcf428f894fb812b" + "sha": "1aeca92e4a38f47134cb955f52ea76f84f09ff88" } } ], From 532301fa3a49c4f1d0f9a49d809e8aa8fc47599a Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 19 Feb 2021 14:19:15 -0800 Subject: [PATCH 4/4] build: reduce download junk in log files * fix: less download junk log files * Update build.sh Source-Author: Elliotte Rusty Harold Source-Date: Fri Feb 19 01:42:29 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 6946fd71ae9215b0e7ae188f5057df765ee6d7d2 Source-Link: https://github.com/googleapis/synthtool/commit/6946fd71ae9215b0e7ae188f5057df765ee6d7d2 --- .kokoro/build.sh | 2 +- .kokoro/dependencies.sh | 4 ++-- synth.metadata | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 903bd94d..34079b25 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -29,7 +29,7 @@ echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index c91e5a56..0fb8c843 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true @@ -86,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi \ No newline at end of file +fi diff --git a/synth.metadata b/synth.metadata index ae7111ac..504d6c2a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,7 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1aeca92e4a38f47134cb955f52ea76f84f09ff88" + "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" } } ],