diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f670bea9..3e701f0ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: working_directory: /go/src/k8s.io/helm parallelism: 3 docker: - - image: circleci/golang:1.10.0 + - image: circleci/golang:1.11.5 environment: - PROJECT_NAME: "kubernetes-helm" - GOCACHE: "/tmp/go/cache" @@ -13,26 +13,26 @@ jobs: - restore_cache: key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }} paths: - - /go/src/k8s.io/helm/vendor + - /go/src/k8s.io/helm/vendor - run: name: install dependencies command: .circleci/bootstrap.sh - save_cache: key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }} paths: - - /go/src/k8s.io/helm/vendor + - /go/src/k8s.io/helm/vendor - restore_cache: keys: - - build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }} + - build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }} paths: - - /tmp/go/cache + - /tmp/go/cache - run: name: test command: .circleci/test.sh - save_cache: key: build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_BUILD_NUM }} paths: - - /tmp/go/cache + - /tmp/go/cache - deploy: name: deploy command: .circleci/deploy.sh diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh index f70cba21b..f30fbfdba 100755 --- a/.circleci/deploy.sh +++ b/.circleci/deploy.sh @@ -41,7 +41,7 @@ curl https://sdk.cloud.google.com | bash ${HOME}/google-cloud-sdk/bin/gcloud --quiet components update echo "Configuring gcloud authentication" -echo "${GCLOUD_SERVICE_KEY}" | base64 --decode > "${HOME}/gcloud-service-key.json" +echo "${GCLOUD_SERVICE_KEY}" | base64 --decode >"${HOME}/gcloud-service-key.json" ${HOME}/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file "${HOME}/gcloud-service-key.json" ${HOME}/google-cloud-sdk/bin/gcloud config set project "${PROJECT_NAME}"