From c07e356d293895fa52f7dd215922861291d3d799 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 23 Dec 2019 15:27:18 +0100 Subject: [PATCH 1/2] Update Golang 1.13.5 go1.13.5 (released 2019/12/04) includes fixes to the go command, the runtime, the linker, and the net/http package. See the Go 1.13.5 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.13.5+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn --- .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 712e3dde5..2d07ab59c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,7 +13,7 @@ environment: GOPATH: C:\gopath CGO_ENABLED: 1 matrix: - - GO_VERSION: 1.13.4 + - GO_VERSION: 1.13.5 before_build: - choco install -y mingw --version 5.3.0 diff --git a/.travis.yml b/.travis.yml index d4363df81..90cd1505a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ os: - linux go: - - "1.13.4" + - "1.13.5" 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 e4dcd550e..b673256a9 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -6,7 +6,7 @@ # 3.) $ make binaries install test # -ARG GOLANG_VERSION=1.13.4 +ARG GOLANG_VERSION=1.13.5 FROM golang:${GOLANG_VERSION} AS golang-base RUN mkdir -p /go/src/github.com/containerd/containerd From 06f6ea099a784ecb62d67548d901dc7a85a65c76 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 23 Dec 2019 15:29:09 +0100 Subject: [PATCH 2/2] switch nighly builds to Go 1.13.5 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5ad9d3b8f..bf0c8b78c 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.12 + go-version: '1.13.5' - name: Checkout uses: actions/checkout@v1 @@ -123,7 +123,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.12 + go-version: '1.13.5' - name: Checkout uses: actions/checkout@v1