Skip to content

K
k3s
Unverified Commit 1127d5c0 authored by Jordan Liggitt's avatar Jordan Liggitt
Browse files
Options

Run bindata generation from KUBE_ROOT

Avoid path differences when running via go:generate and invoking directly
parent 00d26fcf
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 9 deletions
hack/generate-bindata.sh
View file @ 1127d5c0
......@@ -38,14 +38,17 @@ if ! which go-bindata &>/dev/null ; then
exit 5
fi
# run the generation from the root directory for stable output
pushd "${KUBE_ROOT}"
# These are files for e2e tests.
BINDATA_OUTPUT="${KUBE_ROOT}/test/e2e/generated/bindata.go"
go-bindata -nometadata -prefix "${KUBE_ROOT}" -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
BINDATA_OUTPUT="test/e2e/generated/bindata.go"
go-bindata -nometadata -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
-ignore .jpg -ignore .png -ignore .md \
"${KUBE_ROOT}/examples/..." \
"${KUBE_ROOT}/test/e2e/testing-manifests/..." \
"${KUBE_ROOT}/test/images/..." \
"${KUBE_ROOT}/test/fixtures/..."
"examples/..." \
"test/e2e/testing-manifests/..." \
"test/images/..." \
"test/fixtures/..."
gofmt -s -w "${BINDATA_OUTPUT}.tmp"
......@@ -62,10 +65,10 @@ fi
rm -f "${BINDATA_OUTPUT}.tmp"
# These are files for runtime code
BINDATA_OUTPUT="${KUBE_ROOT}/pkg/generated/bindata.go"
go-bindata -nometadata -nocompress -prefix "${KUBE_ROOT}" -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
BINDATA_OUTPUT="pkg/generated/bindata.go"
go-bindata -nometadata -nocompress -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
-ignore .jpg -ignore .png -ignore .md \
"${KUBE_ROOT}/translations/..."
"translations/..."
gofmt -s -w "${BINDATA_OUTPUT}.tmp"
......@@ -80,3 +83,5 @@ else
fi
rm -f "${BINDATA_OUTPUT}.tmp"
popd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment