Merge pull request #823 from jetstack-bot/cherry-pick-822-to-release-0.6

[release-0.6] Upgrade golang to 1.11.11
jetstack · Jun 24, 2019 · 01ec029 · 01ec029
2 parents d072436 + 7ee37d4
commit 01ec029
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ test::tarmak::golang:
   stage: test
   tags:
   - docker
-  image: golang:1.11.10
+  image: golang:1.11.11
   script:
   - rm -rf /go/src/github.com/jetstack
   - mkdir -p /go/src/github.com/jetstack
@@ -63,7 +63,7 @@ release::tarmak::golang:
   stage: release
   tags:
   - docker
-  image: golang:1.11.10
+  image: golang:1.11.11
   only:
   - tags
   script:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Copyright Jetstack Ltd. See LICENSE for details.
 PACKAGE_NAME ?= github.com/jetstack/tarmak
 CONTAINER_DIR := /go/src/$(PACKAGE_NAME)
-GO_VERSION := 1.11.10
+GO_VERSION := 1.11.11
 
 BINDIR ?= $(CURDIR)/bin
 PATH   := $(BINDIR):$(PATH)