From 18df140288b2ba841b1db06feef0e18d33d6c7d6 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 25 Feb 2025 12:45:37 +0900 Subject: [PATCH 1/3] update Go (1.24) Signed-off-by: Akihiro Suda --- .github/workflows/lint.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 4 ++-- Dockerfile | 2 +- hack/build-integration-kubernetes.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0be8c5aa938..8102a57fb88 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ on: pull_request: env: - GO_VERSION: 1.23.x + GO_VERSION: 1.24.x jobs: go: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8439f9a12d1..36fa208e92e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: 1.23.x + go-version: 1.24.x - name: "Compile binaries" run: make artifacts - name: "SHA256SUMS" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b3144b9de2..2cec4115f10 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ on: - '**.md' env: - GO_VERSION: 1.23.x + GO_VERSION: 1.24.x SHORT_TIMEOUT: 5 LONG_TIMEOUT: 60 @@ -312,7 +312,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: ["1.22.x", "1.23.x"] + go-version: ["1.23.x", "1.24.x"] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/Dockerfile b/Dockerfile index d55b5be2ed5..dd5ecae93a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ ARG TINI_VERSION=v0.19.0 ARG BUILDG_VERSION=v0.4.1 # Test deps -ARG GO_VERSION=1.23 +ARG GO_VERSION=1.24 ARG UBUNTU_VERSION=24.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.12.0 diff --git a/hack/build-integration-kubernetes.sh b/hack/build-integration-kubernetes.sh index 5647e4dd4f8..0fcc47474c1 100755 --- a/hack/build-integration-kubernetes.sh +++ b/hack/build-integration-kubernetes.sh @@ -21,7 +21,7 @@ readonly root # shellcheck source=/dev/null . "$root/scripts/lib.sh" -GO_VERSION=1.23 +GO_VERSION=1.24 KIND_VERSION=v0.24.0 CNI_PLUGINS_VERSION=v1.5.1 From 7341e8414aedf7c390e751d4114d45f4277f605e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 25 Feb 2025 12:47:48 +0900 Subject: [PATCH 2/3] CI: set GOTOOLCHAIN=local So that we can specify the Go version deterministically Signed-off-by: Akihiro Suda --- .github/workflows/lint.yml | 1 + .github/workflows/project.yml | 3 +++ .github/workflows/release.yml | 4 ++++ .github/workflows/test.yml | 1 + 4 files changed, 9 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8102a57fb88..ade59a8af5a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,6 +9,7 @@ on: env: GO_VERSION: 1.24.x + GOTOOLCHAIN: local jobs: go: diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index 0330137c885..fafe604b3bb 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -7,6 +7,9 @@ on: - 'release/**' pull_request: +env: + GOTOOLCHAIN: local + jobs: project: name: checks diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36fa208e92e..72940cf30f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ on: tags: - 'v*' - 'test-action-release-*' + +env: + GOTOOLCHAIN: local + jobs: release: runs-on: ubuntu-24.04 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2cec4115f10..50f00ad78b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,6 +11,7 @@ on: env: GO_VERSION: 1.24.x + GOTOOLCHAIN: local SHORT_TIMEOUT: 5 LONG_TIMEOUT: 60 From 11f6fe2c8b001ca351220c28329fb6b4c691140e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 25 Feb 2025 12:54:16 +0900 Subject: [PATCH 3/3] go.mod: set minimum Go version to 1.23 Signed-off-by: Akihiro Suda --- go.mod | 2 +- pkg/testutil/test/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 7c7e36d90f0..3d9fccf1910 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/nerdctl/v2 -go 1.22.7 +go 1.23 require ( github.com/Masterminds/semver/v3 v3.3.1 diff --git a/pkg/testutil/test/go.mod b/pkg/testutil/test/go.mod index 3fa134d2fac..85016f344ef 100644 --- a/pkg/testutil/test/go.mod +++ b/pkg/testutil/test/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/nerdctl/v2/pkg/testutil/test -go 1.22.7 +go 1.23 require ( golang.org/x/sync v0.11.0