Skip to content

K
k3s
Commit 1bd3918c authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Overhaul deps on generator tools

This forces a regeneration if the generation tools are rebuilt. Also clean up Makefile a bit.
parent a9f3ccda
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
hack/jenkins/test-dockerized.sh
View file @ 1bd3918c
...@@ -52,6 +52,7 @@ export LOG_LEVEL=4 ...@@ -52,6 +52,7 @@ export LOG_LEVEL=4
cd /go/src/k8s.io/kubernetes cd /go/src/k8s.io/kubernetes
rm -rf Godeps/_workspace # Temporary until _workspace is fully obliterated rm -rf Godeps/_workspace # Temporary until _workspace is fully obliterated
make generated_files
go install ./cmd/... go install ./cmd/...
./hack/install-etcd.sh ./hack/install-etcd.sh
......
hack/make-rules/vet.sh
View file @ 1bd3918c
...@@ -25,6 +25,7 @@ cd "${KUBE_ROOT}" ...@@ -25,6 +25,7 @@ cd "${KUBE_ROOT}"
# This is required before we run govet for the results to be correct. # This is required before we run govet for the results to be correct.
# See https://github.com/golang/go/issues/16086 for details. # See https://github.com/golang/go/issues/16086 for details.
make generated_files
go install ./cmd/... go install ./cmd/...
# Use eval to preserve embedded quoted strings. # Use eval to preserve embedded quoted strings.
......
hack/update-codecgen.sh
View file @ 1bd3918c
...@@ -117,6 +117,7 @@ if [[ -z ${haveindex} ]]; then ...@@ -117,6 +117,7 @@ if [[ -z ${haveindex} ]]; then
fi fi
echo "Building codecgen" echo "Building codecgen"
make generated_files
CODECGEN="${PWD}/codecgen_binary" CODECGEN="${PWD}/codecgen_binary"
go build -o "${CODECGEN}" ./vendor/github.com/ugorji/go/codec/codecgen go build -o "${CODECGEN}" ./vendor/github.com/ugorji/go/codec/codecgen
......
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