From 0653cf1338a2bc1fd03959de9b01432030569ed7 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Tue, 6 Jul 2021 14:34:47 -0700 Subject: [PATCH 1/2] chore: minimize noise from build scripts This should limit the amount of scrolling client devs have to do when debugging a test failure Co-authored-by: Elliotte Rusty Harold Co-authored-by: Neenu Shaji Source-Author: Igor Bernstein Source-Date: Fri Jun 18 17:28:07 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 1c0c698705e668ccb3d68556ae7260f16ce63a6e Source-Link: https://github.com/googleapis/synthtool/commit/1c0c698705e668ccb3d68556ae7260f16ce63a6e --- .kokoro/coerce_logs.sh | 1 - synth.metadata | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49..46edbf7f 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/synth.metadata b/synth.metadata index 32fc5f8d..c4e16a4f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-tasks.git", - "sha": "5f2c4c1a64d9bee0c0a89566833f140d218e22d8" + "sha": "19bc4be2d0fc080132b3853126848e4e73c899fb" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086" + "sha": "1c0c698705e668ccb3d68556ae7260f16ce63a6e" } } ], From df48cb44d08c1f8581b25e2dfb47b26ce071967e Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Tue, 6 Jul 2021 14:36:27 -0700 Subject: [PATCH 2/2] fix: Add `shopt -s nullglob` to dependencies script This prevents processing the unexpanded glob "**/.flattened-pom.xml" in repos which do not flatten any POMs. Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com> Source-Date: Sat Jun 19 18:35:58 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 87254ac89a9559864c0a245d6b150406439ce3d8 Source-Link: https://github.com/googleapis/synthtool/commit/87254ac89a9559864c0a245d6b150406439ce3d8 --- .kokoro/dependencies.sh | 1 + synth.metadata | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index a7e999d3..9030ba8f 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) diff --git a/synth.metadata b/synth.metadata index c4e16a4f..bff40479 100644 --- a/synth.metadata +++ b/synth.metadata @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1c0c698705e668ccb3d68556ae7260f16ce63a6e" + "sha": "87254ac89a9559864c0a245d6b150406439ce3d8" } } ],