Skip to content

Commit 8377d08

Browse files
committed
Simpler script to export licenses
Fixes #3443 Signed-off-by: David Gageot <[email protected]>
1 parent efff827 commit 8377d08

File tree

784 files changed

+2781
-138012
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

784 files changed

+2781
-138012
lines changed

hack/gen_statik.sh

+10-9
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,23 @@ set -euo pipefail
1919
export GOFLAGS="-mod=vendor"
2020
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
2121
BIN=${DIR}/bin
22-
LICENSES=${BIN}/licenses
2322
STATIK=${BIN}/statik
2423

2524
mkdir -p ${BIN}
2625

27-
if ! [[ -f ${LICENSES} ]]; then
28-
pushd ${DIR}/tools
29-
echo >&2 'Installing licenses tool'
30-
GOBIN=${BIN} GO111MODULE=on go install -tags tools github.com/google/trillian/scripts/licenses
31-
popd
32-
fi
33-
3426
TMP_DIR=$(mktemp -d)
3527
trap "rm -rf $TMP_DIR" EXIT
3628

37-
${LICENSES} save "github.com/GoogleContainerTools/skaffold/cmd/skaffold" --save_path="${TMP_DIR}/skaffold-credits"
29+
# Copy licenses
30+
pushd vendor
31+
LICENSES=$(find . \( -type f -name 'LICENSE*' -or -name 'COPYING*' -or -name 'NOTICE*' \))
32+
for LICENSE in $LICENSES; do
33+
mkdir -p "$(dirname "${TMP_DIR}/skaffold-credits/$LICENSE")"
34+
cp $LICENSE ${TMP_DIR}/skaffold-credits/$LICENSE
35+
done
36+
popd
37+
38+
# Copy schemas
3839
cp -R docs/content/en/schemas "${TMP_DIR}/schemas"
3940

4041
if ! [[ -f ${STATIK} ]]; then

hack/tools/go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ go 1.13
44

55
require (
66
github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752
7-
github.com/google/licenseclassifier v0.0.0-20190926221455-842c0d70d702 // indirect
8-
github.com/google/trillian v1.3.2-0.20191031155000-9600d042b2e7
97
github.com/rakyll/statik v0.1.6
108
)

hack/tools/go.sum

-445
Large diffs are not rendered by default.

hack/tools/tools.go

-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ package main
2020

2121
import (
2222
_ "github.com/corneliusweig/release-notes"
23-
_ "github.com/google/trillian/scripts/licenses"
2423
_ "github.com/rakyll/statik"
2524
)

hack/tools/vendor.sh

-42
This file was deleted.

hack/tools/vendor/github.com/emirpasic/gods/LICENSE

-41
This file was deleted.

hack/tools/vendor/github.com/emirpasic/gods/containers/containers.go

-35
This file was deleted.

hack/tools/vendor/github.com/emirpasic/gods/containers/enumerable.go

-61
This file was deleted.

hack/tools/vendor/github.com/emirpasic/gods/containers/iterator.go

-109
This file was deleted.

hack/tools/vendor/github.com/emirpasic/gods/containers/serialization.go

-17
This file was deleted.

0 commit comments

Comments
 (0)