From a894a7a0ce28d7ca1311fa9ba893d19abb04d882 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 21 Jun 2019 20:36:18 +0300 Subject: [PATCH] CircleCI: update code gen package --- .circleci/config.yml | 7 ++----- go.mod | 2 +- go.sum | 1 + hack/update-codegen.sh | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b79b33d9..7c28491e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,12 +9,9 @@ jobs: - checkout - restore_cache: keys: - - go-mod-v1-{{ checksum "go.sum" }} + - go-mod-v2-{{ checksum "go.sum" }} - run: | go mod download - sudo chmod +x $(echo `go env GOPATH`'/pkg/mod/k8s.io/code-generator@v0.0.0-20190531131525-17d711082421') - ls $(echo `go env GOPATH`'/pkg/mod/k8s.io/') - - run: | make test-fmt make test-codegen @@ -26,7 +23,7 @@ jobs: -a -installsuffix cgo -o bin/flagger ./cmd/flagger/* ./bin/flagger -version - save_cache: - key: go-mod-v1-{{ checksum "go.sum" }} + key: go-mod-v2-{{ checksum "go.sum" }} paths: - "/go/pkg/mod/" - persist_to_workspace: diff --git a/go.mod b/go.mod index c86ed0c9..7ca142f9 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ replace ( k8s.io/api => k8s.io/api v0.0.0-20190531132109-d3f5f50bdd94 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190531131812-859a0ba5e71a k8s.io/client-go => k8s.io/client-go v0.0.0-20190531132438-d58e65e5f4b1 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190531131525-17d711082421 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190511023357-639c964206c2 ) replace k8s.io/klog => github.com/stefanprodan/klog v0.0.0-20190418165334-9cbb78b20423 diff --git a/go.sum b/go.sum index 0500c018..bd559471 100644 --- a/go.sum +++ b/go.sum @@ -506,6 +506,7 @@ k8s.io/apiserver v0.0.0-20190111033246-d50e9ac5404f+incompatible/go.mod h1:6bqaT k8s.io/cli-runtime v0.0.0-20190111035321-c7263d800665+incompatible/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM= k8s.io/client-go v0.0.0-20190531132438-d58e65e5f4b1 h1:P6ePeisThSJsRbzJ4ZetEGkE5dOrMZQzVkdBoB5GFcA= k8s.io/client-go v0.0.0-20190531132438-d58e65e5f4b1/go.mod h1:oBWDlQWEpK7nPTuJljTF4w6W/zjopIHAPOJu70zfOHE= +k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8= k8s.io/code-generator v0.0.0-20190531131525-17d711082421 h1:IW0pZa8zLYATwgv/PIitx8AqxWmKczi6owoI5yD0/5A= k8s.io/code-generator v0.0.0-20190531131525-17d711082421/go.mod h1:dCm/84oAC9Wg9UBdX7tHMtJWiyQnfNjyF8k6Pf/FrWU= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index ab20c47a..ed8b6e74 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -5,7 +5,7 @@ set -o nounset set -o pipefail SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/.. -CODEGEN_PKG=${CODEGEN_PKG:-$(echo `go env GOPATH`'/pkg/mod/k8s.io/code-generator@v0.0.0-20190531131525-17d711082421')} +CODEGEN_PKG=${CODEGEN_PKG:-$(echo `go env GOPATH`'/pkg/mod/k8s.io/code-generator@v0.0.0-20190511023357-639c964206c2')} #chmod +x ${CODEGEN_PKG}/generate-groups.sh