From be0f0db070cdc71344403634177f6c57f88510ca Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 9 Aug 2024 17:05:41 +0200 Subject: [PATCH] update to go1.21.13 / go1.22.6 - https://github.com/golang/go/issues?q=milestone%3AGo1.22.6+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.22.5...go1.22.6 go1.22.6 (released 2024-08-06) includes fixes to the go command, the compiler, the linker, the trace command, the covdata command, and the bytes, go/types, and os/exec packages. See the Go 1.22.6 milestone on our issue tracker for details. go1.21.13 (released 2024-08-06) includes fixes to the go command, the covdata command, and the bytes package. See the Go 1.21.13 milestone on our issue tracker for details. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 228914a5e533db62f2637267c26b0093b6e8625e) Signed-off-by: Akhil Mohan --- .github/actions/install-go/action.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- Vagrantfile | 2 +- contrib/Dockerfile.test | 2 +- script/setup/prepare_env_windows.ps1 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml index 01eb62ff677a..bdaed8a5be8e 100644 --- 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.12" + default: "1.21.13" description: "Go version to install" runs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6c3096bf251..7cc8c2855833 100644 --- 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.12", "1.22.5"] + go-version: ["1.21.13", "1.22.6"] 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 index 09066b10274a..a60386d02990 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ on: name: Containerd Release env: - GO_VERSION: "1.21.12" + GO_VERSION: "1.21.13" permissions: # added using https://github.com/step-security/secure-workflows contents: read diff --git a/Vagrantfile b/Vagrantfile index 6ecb4d58cd0f..5204f06ee9aa 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -96,7 +96,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.12", + 'GO_VERSION': ENV['GO_VERSION'] || "1.21.13", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 767152ef54df..b2590fb51e2d 100644 --- 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.12 +ARG GOLANG_VERSION=1.21.13 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 index 445b9cc1e136..c5b3ca86785a 100644 --- 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.12"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.13"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'