From 3b263d082cb09a2911150135a760508527557a0e Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Thu, 15 Aug 2024 09:59:46 +0530 Subject: [PATCH 1/2] add go1.23.0, drop go1.21.x - switch release and build jobs to 1.22.6 from 1.21.13 - add go1.23.0 to CI matrix - drop go1.21 from CI Signed-off-by: Akhil Mohan --- .github/actions/install-go/action.yml | 2 +- .github/workflows/api-release.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- BUILDING.md | 2 +- Vagrantfile | 2 +- contrib/Dockerfile.test | 2 +- contrib/fuzz/oss_fuzz_build.sh | 4 ++-- go.mod | 2 +- integration/client/go.mod | 2 +- script/setup/prepare_env_windows.ps1 | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/actions/install-go/action.yml b/.github/actions/install-go/action.yml index bdaed8a5be8e..d860cda4db10 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.21.13" + default: "1.22.6" description: "Go version to install" runs: diff --git a/.github/workflows/api-release.yml b/.github/workflows/api-release.yml index 71e56ec67095..d8135f903067 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.21.13" + GO_VERSION: "1.22.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 4342085294d8..ad9d7dd4345a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,7 +192,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022] - go-version: ["1.21.13", "1.22.6"] + go-version: ["1.22.6", "1.23.0"] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/install-go diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e424e6c4f025..20eefa304877 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ on: name: Release env: - GO_VERSION: "1.21.13" + GO_VERSION: "1.22.6" permissions: # added using https://github.com/step-security/secure-workflows contents: read diff --git a/BUILDING.md b/BUILDING.md index 1a688169bf61..911e48742cdf 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -15,7 +15,7 @@ This doc includes: To build the `containerd` daemon, and the `ctr` simple test client, the following build system dependencies are required: -* Go 1.21.x or above +* Go 1.22.x or above * Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/protocolbuffers/protobuf/releases)) * Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency. diff --git a/Vagrantfile b/Vagrantfile index 75eb4f0d1617..401f7198f0a2 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.21.13", + 'GO_VERSION': ENV['GO_VERSION'] || "1.22.6", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 4efe428b1550..04dcebeab9e2 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -29,7 +29,7 @@ # docker run --privileged containerd-test # ------------------------------------------------------------------------------ -ARG GOLANG_VERSION=1.21.13 +ARG GOLANG_VERSION=1.22.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 1c520b3bcfdb..9da5825a9086 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.21.13.linux-amd64.tar.gz +wget --quiet https://go.dev/dl/go1.22.6.linux-amd64.tar.gz mkdir temp-go rm -rf /root/.go/* -tar -C temp-go/ -xzf go1.21.13.linux-amd64.tar.gz +tar -C temp-go/ -xzf go1.22.6.linux-amd64.tar.gz mv temp-go/go/* /root/.go/ cd $SRC/containerd diff --git a/go.mod b/go.mod index a12092d07279..e04399810454 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/containerd -go 1.21 +go 1.22 require ( dario.cat/mergo v1.0.0 diff --git a/integration/client/go.mod b/integration/client/go.mod index 691214ef6953..015222b5dd9e 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/containerd/integration/client -go 1.21 +go 1.22 require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index 76fbcd76ab97..eb0bdb38d3f7 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.21.13"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.6"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip' From c7602808814d6ca235d37323ff37cde9bdf9d6bb Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Thu, 15 Aug 2024 10:15:30 +0530 Subject: [PATCH 2/2] update golangci-lint to 1.60.1 Backport of 939135ae3674a7363e0156f5af1275bac8ed1224 and 20ee6de0b57dabdb2e399aa16d176dad8326084c Signed-off-by: Akhil Mohan --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad9d7dd4345a..333f7257702b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - uses: golangci/golangci-lint-action@v4 with: only-new-issues: true - version: v1.56.1 + version: v1.60.1 skip-cache: true args: --timeout=8m