Merge pull request #10208 from austinvazquez/cherry-pick-25c2f690a8e0…

…31193bcbc1e82a7de33da647fc58-to-release-1.6 [release/1.6] Update tooling to Go 1.21.10, 1.22.3 for net/http bug fixes
containerd · May 13, 2024 · d116eaa · d116eaa
2 parents b3d7fec + 5b4facb
commit d116eaa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml
@@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
 inputs:
   go-version:
     required: true
-    default: "1.21.9"
+    default: "1.21.10"
     description: "Go version to install"
 
 runs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -217,7 +217,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022]
-        go-version: ["1.21.9", "1.22.2"]
+        go-version: ["1.21.10", "1.22.3"]
     steps:
       - name: Install dependencies
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
 name: Containerd Release
 
 env:
-  GO_VERSION: "1.21.9"
+  GO_VERSION: "1.21.10"
 
 permissions:  # added using https://github.com/step-security/secure-workflows
   contents: read

diff --git a/Vagrantfile b/Vagrantfile
@@ -95,7 +95,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.21.9",
+        'GO_VERSION': ENV['GO_VERSION'] || "1.21.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.21.9
+ARG GOLANG_VERSION=1.21.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
@@ -5,7 +5,7 @@
 # lived test environment.
 Set-MpPreference -DisableRealtimeMonitoring:$true
 
-$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.9"; make = ""; nssm = "" }
+$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.10"; make = ""; nssm = "" }
 
 Write-Host "Downloading chocolatey package"
 curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'