From 2a0ca2d077f2a792e5752c1513e706a7bb00ed0e Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 17 Feb 2020 11:08:11 +0100
Subject: [PATCH] Update Golang 1.12.17

full diff: https://github.com/golang/go/compare/go1.12.16...go1.12.17

go1.12.17 (released 2020/02/12) includes a fix to the runtime. See the Go 1.12.17
milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.12.17+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6a3416449ee8dbc1ccc01887108465435c38b6bb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .appveyor.yml           | 2 +-
 .travis.yml             | 2 +-
 contrib/Dockerfile.test | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 37fb4450c5..4512848593 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
   matrix:
-    - GO_VERSION: 1.12.16
+    - GO_VERSION: 1.12.17
 
 before_build:
   - choco install -y mingw --version 5.3.0
diff --git a/.travis.yml b/.travis.yml
index fffd8c6aa2..356cd502f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ services:
 language: go
 
 go:
-  - "1.12.16"
+  - "1.12.17"
 os:
   - "linux"
   # TODO ppc64le is currently timing out on travis; see https://github.com/containerd/containerd/pull/2896
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
index 64dae3fb26..f95da48161 100644
--- a/contrib/Dockerfile.test
+++ b/contrib/Dockerfile.test
@@ -6,7 +6,7 @@
 # 3.) $ make binaries install test
 #
 
-ARG GOLANG_VERSION=1.12.16
+ARG GOLANG_VERSION=1.12.17
 
 FROM golang:${GOLANG_VERSION} AS golang-base
 RUN mkdir -p /go/src/github.com/containerd/containerd