From f2dda6044e63f9d94bd7ff5af936758ab95aed0b Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Sat, 15 Sep 2018 20:01:06 -0400 Subject: [PATCH 1/2] don't require GOPATH env var for update-codegen --- hack/update-codegen.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 11be2d3a8e69..40065c4356f7 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -18,10 +18,15 @@ set -o errexit set -o nounset set -o pipefail +if [ -z "${GOPATH:-}" ]; then + export GOPATH=$(go env GOPATH) +fi + source $(dirname $0)/../vendor/github.com/knative/test-infra/scripts/library.sh CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)} + # generate the code with: # --output-base because this script should also be able to run inside the vendor dir of # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir From 7940b6d4809def5aec72970877d20ab1877b9202 Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Sat, 15 Sep 2018 20:03:32 -0400 Subject: [PATCH 2/2] Use -i flag in hack/update-codegen for readability --- hack/update-codegen.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 40065c4356f7..9e0c02025d5b 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -37,10 +37,12 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt # Depends on generate-groups.sh to install bin/deepcopy-gen -${GOPATH}/bin/deepcopy-gen --input-dirs \ - github.com/knative/serving/pkg/reconciler/v1alpha1/revision/config,github.com/knative/serving/pkg/autoscaler,github.com/knative/serving/pkg/logging \ +${GOPATH}/bin/deepcopy-gen \ -O zz_generated.deepcopy \ - --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt + --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \ + -i github.com/knative/serving/pkg/reconciler/v1alpha1/revision/config \ + -i github.com/knative/serving/pkg/autoscaler \ + -i github.com/knative/serving/pkg/logging # Make sure our dependencies are up-to-date ${REPO_ROOT_DIR}/hack/update-deps.sh