From 2f106c5b1e33b6c9e7d3342d81ac049ce6b16858 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 30 Mar 2020 11:43:12 +0200 Subject: [PATCH] Fix nightly build (#3693) --- .buildkite/pipeline.yml | 2 +- tools/licenses.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8f46681f24..12ba23b43b 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -29,7 +29,7 @@ steps: - label: "Check licenses" command: - mkdir -p /tmp/test-artifacts/licenses - - ./tools/licenses.sh /tmp/test-artifacts/licenses + - ./tools/licenses.sh /tmp/test-artifacts/licenses $BUILDKITE_PIPELINE_SLUG - diff -rNu3 /tmp/test-artifacts/licenses ./licenses/data key: licenses retry: diff --git a/tools/licenses.sh b/tools/licenses.sh index 8abad82664..ad0be867a6 100755 --- a/tools/licenses.sh +++ b/tools/licenses.sh @@ -7,13 +7,14 @@ ROOTDIR=$(dirname "$0")/.. bazel build //:all DSTDIR=${1:-$ROOTDIR/licenses/data} +PROJECT=${2:-scion} rm -rf $DSTDIR -(cd $ROOTDIR/bazel-scion/external; find -L . -iregex '.*\(LICENSE\|COPYING\).*') | while IFS= read -r path ; do +(cd $ROOTDIR/bazel-$PROJECT/external; find -L . -iregex '.*\(LICENSE\|COPYING\).*') | while IFS= read -r path ; do dst=$DSTDIR/$(dirname $path) mkdir -p $dst - cp $ROOTDIR/bazel-scion/external/$path $dst + cp $ROOTDIR/bazel-$PROJECT/external/$path $dst done # Bazel tools are used only for building.