From 1127d5c08b8a68fec35f4829ffe524224d8cd7c9 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 10 Jan 2017 09:50:39 -0500 Subject: [PATCH] Run bindata generation from KUBE_ROOT Avoid path differences when running via go:generate and invoking directly --- hack/generate-bindata.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh index f68653c6a98..4c843c5cdc8 100755 --- a/hack/generate-bindata.sh +++ b/hack/generate-bindata.sh @@ -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