[release/1.6] update to go1.18.10

thaJeztah · thaJeztah · commit 6a8a6531fd4f · 2023-01-24T20:21:54.000+01:00
go1.18.10 (released 2023-01-10) includes fixes to cgo, the compiler, the linker, and the crypto/x509, net/http, and syscall packages. See the Go 1.18.10 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.18.10+label%3ACherryPickApproved full diff: golang/go@go1.18.9...go1.18.10 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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@v3
         with:
-          go-version: '1.18.9'
+          go-version: '1.18.10'
 
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
 env:
   # Go version we currently use to build containerd across all CI.
   # Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
-  GO_VERSION: '1.18.9'
+  GO_VERSION: '1.18.10'
 
 jobs:
   #
@@ -226,7 +226,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
-        go-version: ["1.17.13", "1.18.9"]
+        go-version: ["1.17.13", "1.18.10"]
     steps:
       - name: Install dependencies
         if: matrix.os == 'ubuntu-20.04'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -26,7 +26,7 @@ jobs:
 
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.9
+        go-version: 1.18.10
 
     # 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@v3
         with:
-          go-version: '1.18.9'
+          go-version: '1.18.10'
 
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,7 +7,7 @@ on:
       - '.github/workflows/nightly.yml'
 
 env:
-  GO_VERSION: '1.18.9'
+  GO_VERSION: '1.18.10'
 
 jobs:
   linux:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
 name: Containerd Release
 
 env:
-  GO_VERSION: '1.18.9'
+  GO_VERSION: '1.18.10'
 
 jobs:
   check:
diff --git a/Vagrantfile b/Vagrantfile
@@ -91,7 +91,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.9",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.18.10",
     }
     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.9
+ARG GOLANG_VERSION=1.18.10
 ARG GOLANG_IMAGE=golang
 
 FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1
@@ -1,6 +1,6 @@
 # Prepare windows environment for building and running containerd tests
 
-$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18.9"; make = ""; nssm = "" }
+$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18.10"; make = ""; nssm = "" }
 
 Write-Host "Downloading chocolatey package"
 curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ EOF`
`91`	`91`	`config.vm.provision "install-golang", type: "shell", run: "once" do \|sh\|`
`92`	`92`	`sh.upload_path = "/tmp/vagrant-install-golang"`
`93`	`93`	`sh.env = {`
`94`		`- 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.18.9",`
	`94`	`+ 'GO_VERSION': ENV['GO_VERSION'] \|\| "1.18.10",`
`95`	`95`	`}`
`96`	`96`	`sh.inline = <<~SHELL`
`97`	`97`	`#!/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-rc94 -f Dockerfile.test ../`
`12`	`12`
`13`		`-ARG GOLANG_VERSION=1.18.9`
	`13`	`+ARG GOLANG_VERSION=1.18.10`
`14`	`14`	`ARG GOLANG_IMAGE=golang`
`15`	`15`
`16`	`16`	`FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang`