github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
[release/2.0] update to go1.23.4 / go1.22.10
This commit is contained in:
Derek McGowan 2024-12-06 06:07:41 -08:00 committed by GitHub
commit 154b692b2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/devcontainer.json
View File

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

2
.github/actions/install-go/action.yml vendored
View File

@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
inputs: inputs:
go-version: go-version:
required: true required: true
default: "1.23.3" default: "1.23.4"
description: "Go version to install" description: "Go version to install"
runs: runs:

2
.github/workflows/api-release.yml vendored
View File

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

2
.github/workflows/ci.yml vendored
View File

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

2
.github/workflows/release.yml vendored
View File

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

2
Vagrantfile vendored
View File

@ -107,7 +107,7 @@ EOF
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.23.3", 'GO_VERSION': ENV['GO_VERSION'] || "1.23.4",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

2
contrib/Dockerfile.test
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 # docker run --privileged --group-add keep-groups -v ./critest_exit_code.txt:/tmp/critest_exit_code.txt containerd-test
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
ARG GOLANG_VERSION=1.23.3 ARG GOLANG_VERSION=1.23.4
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

4
contrib/fuzz/oss_fuzz_build.sh
View File

@ -43,11 +43,11 @@ go run main.go --target_dir $SRC/containerd/images
apt-get update && apt-get install -y wget apt-get update && apt-get install -y wget
cd $SRC cd $SRC
wget --quiet https://go.dev/dl/go1.23.3.linux-amd64.tar.gz wget --quiet https://go.dev/dl/go1.23.4.linux-amd64.tar.gz
mkdir temp-go mkdir temp-go
rm -rf /root/.go/* rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.23.3.linux-amd64.tar.gz tar -C temp-go/ -xzf go1.23.4.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/ mv temp-go/go/* /root/.go/
cd $SRC/containerd cd $SRC/containerd

2
script/setup/prepare_env_windows.ps1
View File

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