Merge pull request #6556 from thaJeztah/1.5_bump_go_1.16.14

fuweid · web-flow · commit 6ddbd475babc · 2022-02-16T09:38:34.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.16.13]
+        go-version: [1.16.14]
         os: [ubuntu-18.04, macos-10.15, windows-2019]
 
     steps:
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - shell: bash
         run: |
@@ -87,7 +87,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - uses: actions/checkout@v2
         with:
@@ -120,7 +120,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - name: Set env
         shell: bash
@@ -166,7 +166,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
       - name: Set env
         shell: bash
         run: |
@@ -231,7 +231,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, macos-10.15, windows-2019]
-        go-version: ['1.16.13']
+        go-version: ['1.16.14']
         include:
           # Go 1.13.x is still used by Docker/Moby
           - go-version: '1.13.x'
@@ -277,7 +277,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - uses: actions/checkout@v2
         with:
@@ -358,7 +358,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - uses: actions/checkout@v2
         with:
@@ -510,7 +510,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
       - uses: actions/checkout@v2
         with:
           path: src/github.com/containerd/containerd
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - uses: actions/checkout@v2
         with:
@@ -135,7 +135,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16.13'
+          go-version: '1.16.14'
 
       - uses: actions/checkout@v2
         with:
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.16.13'
+          go-version: '1.16.14'
 
       - name: Set env
         shell: bash
diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml
@@ -2,7 +2,7 @@
   become: yes
   roles:
   - role: config-golang
-    go_version: '1.16.13'
+    go_version: '1.16.14'
     arch: arm64
   tasks:
   - name: Install pre-requisites
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.16.13'
+    go_version: '1.16.14'
     arch: arm64
   tasks:
   - name: Build containerd
diff --git a/.zuul/playbooks/containerd-build/unit-test.yaml b/.zuul/playbooks/containerd-build/unit-test.yaml
@@ -2,7 +2,7 @@
   become: yes
   roles:
   - role: config-golang
-    go_version: '1.16.13'
+    go_version: '1.16.14'
     arch: arm64
   tasks:
   - name: Build and test 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.16.13",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.16.14",
     }
     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.16.13
+ARG GOLANG_VERSION=1.16.14
 
 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.16.13",`
	`80`	`+ 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.16.14",`
`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.16.13`
	`13`	`+ARG GOLANG_VERSION=1.16.14`
`14`	`14`
`15`	`15`	`FROM golang:${GOLANG_VERSION} AS golang-base`
`16`	`16`	`RUN mkdir -p /go/src/github.com/containerd/containerd`