Merge pull request #20 from katiewasnothere/golang1.13.4

update to golang 1.13.4
kevpar · Nov 13, 2019 · 36d136c · 36d136c
2 parents 1cdf7cb + 6d5b601
commit 36d136c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,7 +12,7 @@ environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
   matrix:
-    - GO_VERSION: 1.12.9
+    - GO_VERSION: 1.13.4
 
 before_build:
   - choco install -y mingw --version 5.3.0

diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ os:
 - linux
 
 go:
-  - "1.12.x"
+  - "1.13.4"
 
 env:
   - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic

diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -6,7 +6,7 @@
 # 3.) $ make binaries install test
 #
 
-ARG GOLANG_VERSION=1.12
+ARG GOLANG_VERSION=1.13.4
 
 FROM golang:${GOLANG_VERSION} AS golang-base
 RUN mkdir -p /go/src/github.com/containerd/containerd
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ os: @@
     - linux
     go:
-      - "1.12.x"
+      - "1.13.4"
     env:
       - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic
@@ Expand Down @@