mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 14:07:14 +00:00
Run bindata generation from KUBE_ROOT
Avoid path differences when running via go:generate and invoking directly
This commit is contained in:
parent
00d26fcfc0
commit
1127d5c08b
@ -38,14 +38,17 @@ if ! which go-bindata &>/dev/null ; then
|
|||||||
exit 5
|
exit 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# run the generation from the root directory for stable output
|
||||||
|
pushd "${KUBE_ROOT}"
|
||||||
|
|
||||||
# These are files for e2e tests.
|
# These are files for e2e tests.
|
||||||
BINDATA_OUTPUT="${KUBE_ROOT}/test/e2e/generated/bindata.go"
|
BINDATA_OUTPUT="test/e2e/generated/bindata.go"
|
||||||
go-bindata -nometadata -prefix "${KUBE_ROOT}" -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
|
go-bindata -nometadata -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
|
||||||
-ignore .jpg -ignore .png -ignore .md \
|
-ignore .jpg -ignore .png -ignore .md \
|
||||||
"${KUBE_ROOT}/examples/..." \
|
"examples/..." \
|
||||||
"${KUBE_ROOT}/test/e2e/testing-manifests/..." \
|
"test/e2e/testing-manifests/..." \
|
||||||
"${KUBE_ROOT}/test/images/..." \
|
"test/images/..." \
|
||||||
"${KUBE_ROOT}/test/fixtures/..."
|
"test/fixtures/..."
|
||||||
|
|
||||||
gofmt -s -w "${BINDATA_OUTPUT}.tmp"
|
gofmt -s -w "${BINDATA_OUTPUT}.tmp"
|
||||||
|
|
||||||
@ -62,10 +65,10 @@ fi
|
|||||||
rm -f "${BINDATA_OUTPUT}.tmp"
|
rm -f "${BINDATA_OUTPUT}.tmp"
|
||||||
|
|
||||||
# These are files for runtime code
|
# These are files for runtime code
|
||||||
BINDATA_OUTPUT="${KUBE_ROOT}/pkg/generated/bindata.go"
|
BINDATA_OUTPUT="pkg/generated/bindata.go"
|
||||||
go-bindata -nometadata -nocompress -prefix "${KUBE_ROOT}" -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
|
go-bindata -nometadata -nocompress -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
|
||||||
-ignore .jpg -ignore .png -ignore .md \
|
-ignore .jpg -ignore .png -ignore .md \
|
||||||
"${KUBE_ROOT}/translations/..."
|
"translations/..."
|
||||||
|
|
||||||
gofmt -s -w "${BINDATA_OUTPUT}.tmp"
|
gofmt -s -w "${BINDATA_OUTPUT}.tmp"
|
||||||
|
|
||||||
@ -80,3 +83,5 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f "${BINDATA_OUTPUT}.tmp"
|
rm -f "${BINDATA_OUTPUT}.tmp"
|
||||||
|
|
||||||
|
popd
|
||||||
|
Loading…
Reference in New Issue
Block a user