diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml index 295f139c6..63087af8b 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.22.3" + default: "1.22.4" description: "Go version to install" runs: diff --git a/.github/workflows/api-release.yml b/.github/workflows/api-release.yml index d8062b1f6..7b2814de9 100644 --- a/.github/workflows/api-release.yml +++ b/.github/workflows/api-release.yml @@ -6,7 +6,7 @@ on: name: API Release env: - GO_VERSION: "1.22.3" + GO_VERSION: "1.22.4" permissions: # added using https://github.com/step-security/secure-workflows contents: read diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6e90cb7e..e0cffdc42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -191,7 +191,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022] - go-version: ["1.22.3"] + go-version: ["1.22.4"] exclude: - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 19da7d3ce..c3a1b1081 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ on: name: Release env: - GO_VERSION: "1.22.3" + GO_VERSION: "1.22.4" permissions: # added using https://github.com/step-security/secure-workflows contents: read diff --git a/Vagrantfile b/Vagrantfile index 0ec33cc2c..1b912a7e3 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -104,7 +104,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.22.3", + 'GO_VERSION': ENV['GO_VERSION'] || "1.22.4", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 14ea38d80..ba3ef75ce 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -29,7 +29,7 @@ # docker run --privileged containerd-test # ------------------------------------------------------------------------------ -ARG GOLANG_VERSION=1.22.3 +ARG GOLANG_VERSION=1.22.4 ARG GOLANG_IMAGE=golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh index b005f2ae0..8303f7ff2 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.22.3.linux-amd64.tar.gz +wget --quiet https://go.dev/dl/go1.22.4.linux-amd64.tar.gz mkdir temp-go rm -rf /root/.go/* -tar -C temp-go/ -xzf go1.22.3.linux-amd64.tar.gz +tar -C temp-go/ -xzf go1.22.4.linux-amd64.tar.gz mv temp-go/go/* /root/.go/ cd $SRC/containerd diff --git a/script/setup/install-runc b/script/setup/install-runc index 6bdd023ce..940b75d7c 100755 --- a/script/setup/install-runc +++ b/script/setup/install-runc @@ -38,8 +38,8 @@ function install_runc() { # https://github.com/opencontainers/runc/issues/4233 GO121DIR="${TMPROOT}"/go121 mkdir -p "${GO121DIR}" - GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.9@latest - GO121="${GO121DIR}"/go1.21.9 + GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.11@latest + GO121="${GO121DIR}"/go1.21.11 $GO121 download git clone "${RUNC_REPO}" "${TMPROOT}"/runc pushd "${TMPROOT}"/runc diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index 94d1d6d98..a56be9693 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.22.3"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.4"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'