Compile hack tools into _output/bin/ rather than temp directories

This commit is contained in:
Peter Rifel 2020-10-26 14:33:53 -04:00
parent b2e06093d8
commit 1f4e02be6c
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
5 changed files with 9 additions and 15 deletions

View File

@ -20,6 +20,8 @@ set -o nounset
set -o pipefail
KOPS_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. >/dev/null 2>&1 && pwd )"
TOOLS_BIN="${KOPS_ROOT}/_output/bin"
export KOPS_ROOT TOOLS_BIN
kube::util::array_contains() {
local search="$1"

View File

@ -22,12 +22,9 @@ set -o pipefail
cd "${KOPS_ROOT}"
TMP_OUT=$(mktemp -d)
trap "{ rm -rf ${TMP_OUT}; }" EXIT
GOBIN="${TOOLS_BIN}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
"${TMP_OUT}/gazelle" fix \
"${TOOLS_BIN}/gazelle" fix \
-external=vendored \
-exclude=tests/e2e \
-mode=fix \

View File

@ -17,12 +17,9 @@
cd "${KOPS_ROOT}"
TMP_OUT=$(mktemp -d)
trap "{ rm -rf ${TMP_OUT}; }" EXIT
GOBIN="${TOOLS_BIN}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
gazelle_diff=$("${TMP_OUT}/gazelle" fix \
gazelle_diff=$("${TOOLS_BIN}/gazelle" fix \
-external=vendored \
-exclude=tests/e2e \
-mode=diff \

View File

@ -22,10 +22,8 @@ set -o pipefail
cd "${KOPS_ROOT}"
OUTPUT_GOBIN="${KOPS_ROOT}/_output/bin"
# Install tools we need, but from vendor/
GOBIN="${OUTPUT_GOBIN}" go install ./vendor/github.com/client9/misspell/cmd/misspell
GOBIN="${TOOLS_BIN}" go install ./vendor/github.com/client9/misspell/cmd/misspell
mkdir -p .build/docs
@ -34,6 +32,6 @@ find . -type f \( -name "*.go*" -o -name "*.md*" \) -a -path "./docs/releases/*"
xargs -I{} sh -c 'sed -e "/^\* .*github.com\/kubernetes\/kops\/pull/d" docs/releases/{} > .build/docs/$(basename {})'
find . -type f \( -name "*.go*" -o -name "*.md*" \) -a \( -not -path "./vendor/*" -not -path "./docs/releases/*" \) | \
sed -e /README-ES.md/d -e /node_modules/d |
xargs ${OUTPUT_GOBIN}/misspell -error
xargs ${TOOLS_BIN}/misspell -error

View File

@ -50,7 +50,7 @@ IGNORE=(
export IFS='|'; ignore_pattern="^(${IGNORE[*]-})\$"; unset IFS
# Ensure that we find the binaries we build before anything else.
export GOBIN="${KOPS_ROOT}/_output/bin"
export GOBIN="${TOOLS_BIN}"
PATH="${GOBIN}:${PATH}"
# Install staticcheck from vendor