diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2ffe7299dfad8..ff82bbc5791ca 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.5" + "version": "1.26.6" } }, diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml index 63f87e414f5aa..66e057d49b4da 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.5" + default: "1.26.6" description: "Go version to install" runs: diff --git a/.github/workflows/api-release.yml b/.github/workflows/api-release.yml index 4b18fb3b7f246..79c450e153af7 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.5" + GO_VERSION: "1.26.6" 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 738ee5c91f215..fd7ee0a888682 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,7 +201,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest] - go-version: ["1.26.5"] # 1.25 is not supported due to k8s 1.36 requiring 1.26 + go-version: ["1.26.6"] # 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 87996efb6c75f..c9cfc1bf1adbc 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.5 +ARG GO_VERSION=1.26.6 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/contrib/Dockerfile.test b/contrib/Dockerfile.test index b5b7093740996..5268d86700e97 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.5 +ARG GOLANG_VERSION=1.26.6 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 f2df1a3c865d6..bd67f60238040 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.5.linux-amd64.tar.gz +wget --quiet https://go.dev/dl/go1.26.6.linux-amd64.tar.gz mkdir temp-go rm -rf /root/.go/* -tar -C temp-go/ -xzf go1.26.5.linux-amd64.tar.gz +tar -C temp-go/ -xzf go1.26.6.linux-amd64.tar.gz mv temp-go/go/* /root/.go/ cd $SRC/containerd diff --git a/go.mod b/go.mod index 7c7734df78201..7f2bc15a042d0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/containerd/v2 -go 1.26.3 +go 1.26.6 require ( dario.cat/mergo v1.0.2 diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index dec9c4bd8a32d..9246699458165 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.5"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.26.6"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip' diff --git a/script/vm/provision.sh b/script/vm/provision.sh index aee720f650427..daaaa3b48c3e1 100755 --- a/script/vm/provision.sh +++ b/script/vm/provision.sh @@ -32,7 +32,7 @@ fi script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)" containerd_dir="$(cd -- "${script_dir}/../.." > /dev/null 2>&1; pwd -P)" -: "${GO_VERSION:=1.26.5}" +: "${GO_VERSION:=1.26.6}" : "${RUNC_FLAVOR:=runc}" : "${SELINUX:=Enforcing}" : "${INSTALL_PACKAGES:=}"