diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 50ab76791e03d..d86dff9f27557 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.26.0" + "version": "1.26.2" } }, diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml index 6e1e9a596d277..dd7790a54429f 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.26.0" + default: "1.26.2" description: "Go version to install" runs: diff --git a/.github/workflows/api-release.yml b/.github/workflows/api-release.yml index e09a46bfa9fd0..8e6eae28a8ae5 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.26.0" + GO_VERSION: "1.26.2" 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 b5771928a9f00..3283d0d134521 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -186,7 +186,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest] - go-version: ["1.26.0", "1.26.1"] # 1.25 is not supported due to k8s 1.36 requiring 1.26 + go-version: ["1.26.1", "1.26.2"] # 1.25 is not supported due to k8s 1.36 requiring 1.26 exclude: - os: ${{ github.event.repository.private && 'ubuntu-24.04-arm' || '' }} steps: diff --git a/.github/workflows/release/Dockerfile b/.github/workflows/release/Dockerfile index 16c729c309f96..14d0a08b4ca55 100644 --- a/.github/workflows/release/Dockerfile +++ b/.github/workflows/release/Dockerfile @@ -14,7 +14,7 @@ ARG UBUNTU_VERSION=22.04 ARG BASE_IMAGE=ubuntu:${UBUNTU_VERSION} -ARG GO_VERSION=1.26.0 +ARG GO_VERSION=1.26.2 ARG GO_IMAGE=golang:${GO_VERSION} FROM --platform=$BUILDPLATFORM $GO_IMAGE AS go FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 AS xx diff --git a/Vagrantfile b/Vagrantfile index 0aa8f9b74dedf..518357c05b43c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -109,7 +109,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.26.0", + 'GO_VERSION': ENV['GO_VERSION'] || "1.26.2", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 624f7c6e5d4ea..00f8477e56c54 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -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.26.0 +ARG GOLANG_VERSION=1.26.2 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 2acbf63853b3a..33539684fb63d 100755 --- a/contrib/fuzz/oss_fuzz_build.sh +++ b/contrib/fuzz/oss_fuzz_build.sh @@ -39,11 +39,11 @@ compile_fuzzers() { apt-get update && apt-get install -y wget cd $SRC -wget --quiet https://go.dev/dl/go1.26.0.linux-amd64.tar.gz +wget --quiet https://go.dev/dl/go1.26.2.linux-amd64.tar.gz mkdir temp-go rm -rf /root/.go/* -tar -C temp-go/ -xzf go1.26.0.linux-amd64.tar.gz +tar -C temp-go/ -xzf go1.26.2.linux-amd64.tar.gz mv temp-go/go/* /root/.go/ cd $SRC/containerd diff --git a/go.mod b/go.mod index d3cccdd70fab4..6dcc61cdb957c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/containerd/v2 -go 1.26.0 +go 1.26.2 require ( dario.cat/mergo v1.0.2 diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index 240fb44ed862d..1076350502466 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.26.0"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.26.2"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'