From 4838f33f7e012a61465a1b41895e942d3e6d8abc Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Thu, 17 Apr 2025 00:30:54 +0530 Subject: [PATCH] update to go 1.24.2, 1.23.8 - go1.23.8 (released 2025-04-01) includes security fixes to the net/http package, as well as bug fixes to the runtime and the go command. Ref: https://github.com/golang/go/issues?q=milestone%3AGo1.23.8+label%3ACherryPickApproved - go1.24.2 (released 2025-04-01) includes security fixes to the net/http package, as well as bug fixes to the compiler, the runtime, the go command, and the crypto/tls, go/types, net/http, and testing packages. Ref: https://github.com/golang/go/issues?q=milestone%3AGo1.24.2+label%3ACherryPickApproved Signed-off-by: Akhil Mohan (cherry picked from commit 5629e9fff7de69a36f5f563d41966aa562866258) Signed-off-by: Derek McGowan --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci.yml | 2 +- Vagrantfile | 2 +- contrib/fuzz/oss_fuzz_build.sh | 4 ++-- script/setup/prepare_env_windows.ps1 | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 97c90dced..da17abab3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,7 +12,7 @@ "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/go:1": { - "version": "1.23.7" + "version": "1.23.8" } }, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19b7ac879..e3ac03334 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,7 +189,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-13, windows-2019, windows-2022] - go-version: ["1.24.1", "1.23.7"] + go-version: ["1.24.2", "1.23.8"] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./.github/actions/install-go diff --git a/Vagrantfile b/Vagrantfile index 8f27cfcbb..ada7ecb93 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -107,7 +107,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.23.7", + 'GO_VERSION': ENV['GO_VERSION'] || "1.23.8", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh index 2ceb71c62..0dc064cd3 100755 --- a/contrib/fuzz/oss_fuzz_build.sh +++ b/contrib/fuzz/oss_fuzz_build.sh @@ -43,11 +43,11 @@ go run main.go --target_dir $SRC/containerd/images apt-get update && apt-get install -y wget cd $SRC -wget --quiet https://go.dev/dl/go1.23.7.linux-amd64.tar.gz +wget --quiet https://go.dev/dl/go1.23.8.linux-amd64.tar.gz mkdir temp-go rm -rf /root/.go/* -tar -C temp-go/ -xzf go1.23.7.linux-amd64.tar.gz +tar -C temp-go/ -xzf go1.23.8.linux-amd64.tar.gz mv temp-go/go/* /root/.go/ cd $SRC/containerd diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index 6c2e72477..4dc756dc1 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.23.7"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.23.8"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'