From 94964b36d0248257743615a5e3bff0bea301d55c Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 17 Jan 2020 15:54:16 +0100
Subject: [PATCH] Update Golang 1.13.6

full diff: https://github.com/golang/go/compare/go1.13.5...go1.13.6

go1.13.6 (released 2020/01/09) includes fixes to the runtime and the net/http
package. See the Go 1.13.6 milestone on the issue tracker for details.

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .appveyor.yml                 | 2 +-
 .github/workflows/nightly.yml | 4 ++--
 .travis.yml                   | 2 +-
 contrib/Dockerfile.test       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2d07ab59c..6da043859 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
   matrix:
-    - GO_VERSION: 1.13.5
+    - GO_VERSION: 1.13.6
 
 before_build:
   - choco install -y mingw --version 5.3.0
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bf0c8b78c..d9c609087 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.5'
+          go-version: '1.13.6'
 
       - name: Checkout
         uses: actions/checkout@v1
@@ -123,7 +123,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.5'
+          go-version: '1.13.6'
 
       - name: Checkout
         uses: actions/checkout@v1
diff --git a/.travis.yml b/.travis.yml
index 31b35b94d..345fcbf91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ os:
 - linux
 
 go:
-  - "1.13.5"
+  - "1.13.6"
 
 env:
   - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
index b673256a9..6ba823ca5 100644
--- a/contrib/Dockerfile.test
+++ b/contrib/Dockerfile.test
@@ -6,7 +6,7 @@
 # 3.) $ make binaries install test
 #
 
-ARG GOLANG_VERSION=1.13.5
+ARG GOLANG_VERSION=1.13.6
 
 FROM golang:${GOLANG_VERSION} AS golang-base
 RUN mkdir -p /go/src/github.com/containerd/containerd