Merge pull request #6 from giantswarm/golang-1.7

Bumps to golang 1.7
giantswarm · Aug 24, 2016 · 10389af · 10389af
2 parents 2811ca8 + 998c36e
commit 10389af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false # Explicitly use container-based infrastructure
 language: go
 
 go:
-  - 1.6.2
+  - 1.7
 
 env:
     - BUILDER_VERSION=0.11.0

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ BUILD_PATH := $(shell pwd)/.gobuild
 GS_PATH := $(BUILD_PATH)/src/github.com/giantswarm
 GOPATH := $(BUILD_PATH)
 
-GOVERSION=1.6.2
+GOVERSION=1.7
 
 BIN := $(PROJECT)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ sudo: false # Explicitly use container-based infrastructure @@
     language: go
     go:
-      - 1.6.2
+      - 1.7
     env:
         - BUILDER_VERSION=0.11.0
@@ Expand Down @@