From 7606f0879c9eef980e652bd74842c6dcf1ee28a7 Mon Sep 17 00:00:00 2001
From: Adam Reese <adamreese@users.noreply.github.com>
Date: Wed, 10 Jun 2020 11:44:12 -0700
Subject: [PATCH] fix(ci): use go 1.14 (#8288)
Signed-off-by: Adam Reese <adam@reese.io>
---
.circleci/config.yml | 2 +-
Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92d2f732c..1470e113c 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: golang:1.13.3
+ - image: golang:1.14
environment:
PROJECT_NAME: "kubernetes-helm"
steps:
diff --git a/Makefile b/Makefile
index 311bb8918..d3181f015 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
DOCKER_REGISTRY ?= gcr.io
IMAGE_PREFIX ?= kubernetes-helm
-DEV_IMAGE ?= golang:1.13.3
+DEV_IMAGE ?= golang:1.14
SHORT_NAME ?= tiller
SHORT_NAME_RUDDER ?= rudder
TARGETS ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
--
GitLab