[release/1.4] Update Go to 1.15.13

thaJeztah · thaJeztah · commit d02ed46d276c · 2021-06-25T14:46:10.000+02:00
go1.15.13 (released 2021-06-03) includes security fixes to the archive/zip, math/big, net, and net/http/httputil packages, as well as bug fixes to the linker, the go command, and the math/big and net/http packages. See the Go 1.15.13 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.15.13+label%3ACherryPickApproved go1.15.12 (released 2021-05-06) includes a security fix to the net/http package, as well as bug fixes to the runtime, the compiler, and the archive/zip, time, and syscall packages. See the Go 1.15.12 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.15.12+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
@@ -80,7 +80,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
@@ -126,7 +126,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
@@ -162,7 +162,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
@@ -193,7 +193,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
@@ -272,7 +272,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Checkout
         uses: actions/checkout@v1
@@ -134,7 +134,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Checkout
         uses: actions/checkout@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.15.11'
+          go-version: '1.15.13'
 
       - name: Set env
         shell: bash
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ os:
 - linux
 
 go:
-  - "1.15.11"
+  - "1.15.13"
 
 env:
   - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct
diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml
@@ -2,7 +2,7 @@
   become: yes
   roles:
   - role: config-golang
-    go_version: '1.15.11'
+    go_version: '1.15.13'
     arch: arm64
   tasks:
   - name: Build containerd
diff --git a/Vagrantfile b/Vagrantfile
@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
     sh.upload_path = "/tmp/vagrant-install-golang"
     sh.env = {
-        'GO_VERSION': ENV['GO_VERSION'] || "1.15.11",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.15.13",
     }
     sh.inline = <<~SHELL
         #!/usr/bin/env bash
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -10,7 +10,7 @@
 #
 # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../
 
-ARG GOLANG_VERSION=1.15.11
+ARG GOLANG_VERSION=1.15.13
 
 FROM golang:${GOLANG_VERSION} AS golang-base
 RUN mkdir -p /go/src/github.com/containerd/containerd

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ Vagrant.configure("2") do \|config\|`
`77`	`77`	`config.vm.provision "install-golang", type: "shell", run: "once" do \|sh\|`
`78`	`78`	`sh.upload_path = "/tmp/vagrant-install-golang"`
`79`	`79`	`sh.env = {`
`80`		`- 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.15.11",`
	`80`	`+ 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.15.13",`
`81`	`81`	`}`
`82`	`82`	`sh.inline = <<~SHELL`
`83`	`83`	`#!/usr/bin/env bash`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#`
`11`	`11`	`# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../`
`12`	`12`
`13`		`-ARG GOLANG_VERSION=1.15.11`
	`13`	`+ARG GOLANG_VERSION=1.15.13`
`14`	`14`
`15`	`15`	`FROM golang:${GOLANG_VERSION} AS golang-base`
`16`	`16`	`RUN mkdir -p /go/src/github.com/containerd/containerd`