Skip to content

Commit 97940b3

Browse files
fix: Update dependencies.sh to not break on mac (#1830)
* fix: Update dependencies.sh to not break on mac Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com> Source-Date: Tue Jun 15 14:06:42 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8f76a885deaaf2fe234daeba4a8cc4d1b3de8086 Source-Link: googleapis/synthtool@8f76a88 * 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 <elharo@users.noreply.github.com> Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com> Source-Author: Igor Bernstein <igorbernstein@google.com> Source-Date: Fri Jun 18 17:28:07 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 1c0c698705e668ccb3d68556ae7260f16ce63a6e Source-Link: googleapis/synthtool@1c0c698 * 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: googleapis/synthtool@87254ac
1 parent 1aecfa0 commit 97940b3

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.kokoro/coerce_logs.sh

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
2828
echo "coercing sponge logs..."
2929
for xml in `find . -name *-sponge_log.xml`
3030
do
31-
echo "processing ${xml}"
3231
class=$(basename ${xml} | cut -d- -f2)
3332
dir=$(dirname ${xml})/${job}/${class}
3433
text=$(dirname ${xml})/${class}-sponge_log.txt

.kokoro/dependencies.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515

1616
set -eo pipefail
17+
shopt -s nullglob
1718

1819
## Get the directory of the build script
1920
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -46,7 +47,7 @@ function completenessCheck() {
4647
# This is stripped from the output as it is not present in the flattened pom.
4748
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
4849
msg "Generating dependency list using original pom..."
49-
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
50+
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
5051

5152
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
5253
msg "Generating dependency list using flattened pom..."
@@ -70,7 +71,7 @@ function completenessCheck() {
7071
set +e
7172

7273
error_count=0
73-
for path in $(find -name ".flattened-pom.xml")
74+
for path in **/.flattened-pom.xml
7475
do
7576
# Check flattened pom in each dir that contains it for completeness
7677
dir=$(dirname "$path")

synth.metadata

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/google-api-java-client.git",
7-
"sha": "56f5b8be0a60cb1cf0b279743d85ef57d9aa46b6"
7+
"sha": "d979c5bfdeaf8bd85cd7295abf5695dc6095bad6"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "synthtool",
1313
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
14+
"sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
1515
}
1616
}
1717
],
@@ -80,6 +80,7 @@
8080
"CODE_OF_CONDUCT.md",
8181
"CONTRIBUTING.md",
8282
"LICENSE",
83+
"SECURITY.md",
8384
"codecov.yaml",
8485
"samples/install-without-bom/pom.xml",
8586
"samples/pom.xml",

0 commit comments

Comments
 (0)