Merge pull request #270 from square/cs/1.13.3

Update to Go 1.13.3
ghostunnel · Oct 20, 2019 · 7e3bf78 · 7e3bf78
2 parents 19170c2 + 55dbdbb
commit 7e3bf78
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ services:
   - docker
 
 go:
-  - '1.13.1'
+  - '1.13.3'
 
 deploy:
   - provider: releases

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@
 # To run ghostunnel from the image (for example):
 #     docker run --rm squareup/ghostunnel --version
 
-FROM golang:1.12.6-alpine as build
+FROM golang:1.13.3-alpine as build
 
 MAINTAINER Cedric Staub "cs@squareup.com"
 

diff --git a/Makefile.dist b/Makefile.dist
@@ -2,7 +2,7 @@
 MKFILE_PATH := $(lastword $(MAKEFILE_LIST))
 CURRENT_DIR := $(patsubst %/,%,$(dir $(realpath $(MKFILE_PATH))))
 
-GO_VERSION ?= 1.13.1
+GO_VERSION ?= 1.13.3
 XGO_BASE_IMAGE ?= cssx/xgo-${GO_VERSION}
 
 # Current system information

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ To run tests:
     make test
 
     # Option 2: run unit & integration tests in a Docker container
-    GO_VERSION=1.13.1 make docker-test
+    GO_VERSION=1.13.3 make docker-test
 
     # Open coverage information in browser
     go tool cover -html coverage-merged.out