Merge pull request #11297 from k8s-infra-cherrypick-robot/cherry-pick-11277-to-release/2.0

[release/2.0] update to go1.23.5 / go1.22.11
This commit is contained in:
Derek McGowan 2025-01-22 10:09:18 -07:00 committed by GitHub
commit c18314700a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 10 additions and 10 deletions

View File

@ -12,7 +12,7 @@
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/go:1": {
"version": "1.23.4"
"version": "1.23.5"
}
},

View File

@ -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.23.4"
default: "1.23.5"
description: "Go version to install"
runs:

View File

@ -6,7 +6,7 @@ on:
name: API Release
env:
GO_VERSION: "1.23.4"
GO_VERSION: "1.23.5"
permissions: # added using https://github.com/step-security/secure-workflows
contents: read

View File

@ -191,7 +191,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-24.04, arm64-8core-32gb, macos-13, windows-2019, windows-2022]
go-version: ["1.22.10", "1.23.4"]
go-version: ["1.22.11", "1.23.5"]
exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
steps:

View File

@ -13,7 +13,7 @@ on:
name: Release
env:
GO_VERSION: "1.23.4"
GO_VERSION: "1.23.5"
permissions: # added using https://github.com/step-security/secure-workflows
contents: read

2
Vagrantfile vendored
View File

@ -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.4",
'GO_VERSION': ENV['GO_VERSION'] || "1.23.5",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash

View File

@ -34,7 +34,7 @@
# docker run --privileged --group-add keep-groups -v ./critest_exit_code.txt:/tmp/critest_exit_code.txt containerd-test
# ------------------------------------------------------------------------------
ARG GOLANG_VERSION=1.23.4
ARG GOLANG_VERSION=1.23.5
ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

View File

@ -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.4.linux-amd64.tar.gz
wget --quiet https://go.dev/dl/go1.23.5.linux-amd64.tar.gz
mkdir temp-go
rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.23.4.linux-amd64.tar.gz
tar -C temp-go/ -xzf go1.23.5.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/
cd $SRC/containerd

View File

@ -5,7 +5,7 @@
# lived test environment.
Set-MpPreference -DisableRealtimeMonitoring:$true
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.23.4"; make = ""; nssm = "" }
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.23.5"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'