Merge pull request #6926 from thaJeztah/bump_golang_1.18.2

estesp · web-flow · commit e85b5a0b81a6 · 2022-05-11T18:38:21.000+01:00
update golang to 1.18.2, 1.17.10
diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml
@@ -39,7 +39,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.18.1]
+        go-version: [1.18.2]
         os: [ubuntu-18.04, macos-10.15, windows-2019]
 
     steps:
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
@@ -78,7 +78,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
@@ -110,7 +110,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
       - uses: actions/checkout@v2
       - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
       - run: make man
@@ -148,7 +148,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
       - uses: actions/checkout@v2
       - run: |
           set -e -x
@@ -215,7 +215,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
-        go-version: ['1.17.9', '1.18.1']
+        go-version: ['1.17.10', '1.18.2']
     steps:
       - uses: actions/setup-go@v2
         with:
@@ -261,7 +261,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
@@ -389,7 +389,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
 
@@ -508,7 +508,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
       - uses: actions/checkout@v2
       - run: sudo -E PATH=$PATH script/setup/install-gotestsum
       - name: Tests
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -26,7 +26,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.18.1
+        go-version: 1.18.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
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.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
@@ -155,7 +155,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
 
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,7 +66,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.18.1'
+          go-version: '1.18.2'
       - name: Set env
         shell: bash
         env:
@@ -109,7 +109,7 @@ jobs:
           find ./releases/ -maxdepth 1 -type l | xargs rm
         working-directory: src/github.com/containerd/containerd
         env:
-          GO_VERSION: '1.18.1'
+          GO_VERSION: '1.18.2'
           PLATFORM: ${{ matrix.platform }}
       - name: Save Artifacts
         uses: actions/upload-artifact@v2
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.18.1'
+    go_version: '1.18.2'
     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.18.1'
+    go_version: '1.18.2'
     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.18.1'
+    go_version: '1.18.2'
     arch: arm64
   tasks:
   - name: Build and test containerd
diff --git a/Vagrantfile b/Vagrantfile
@@ -97,7 +97,7 @@ EOF
   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.18.1",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.18.2",
     }
     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-rc94 -f Dockerfile.test ../
 
-ARG GOLANG_VERSION=1.18.1
+ARG GOLANG_VERSION=1.18.2
 ARG GOLANG_IMAGE=golang
 
 FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ EOF`
`97`	`97`	`config.vm.provision "install-golang", type: "shell", run: "once" do \|sh\|`
`98`	`98`	`sh.upload_path = "/tmp/vagrant-install-golang"`
`99`	`99`	`sh.env = {`
`100`		`- 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.18.1",`
	`100`	`+ 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.18.2",`
`101`	`101`	`}`
`102`	`102`	`sh.inline = <<~SHELL`
`103`	`103`	`#!/usr/bin/env bash`