From e9d822973438af917dc95a929262075d2c221e01 Mon Sep 17 00:00:00 2001 From: Bin Du Date: Wed, 11 Feb 2026 11:51:18 -0800 Subject: [PATCH 1/2] chore: upgrade golang to 1.26 and golangci-lint to 2.9 Signed-off-by: Bin Du --- .github/workflows/check.yml | 4 ++-- .github/workflows/ci-build-image.yml | 2 +- .github/workflows/ci-unit-test.yml | 2 +- .github/workflows/ci-userspace-convertor.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/release.yml | 2 +- AGENTS.md | 2 +- ci/e2e/go.mod | 2 +- .../samples/run-userspace-convertor-ubuntu.Dockerfile | 6 +++--- docs/BUILDING.md | 2 +- docs/QUICKSTART.md | 2 +- go.mod | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8094dc87..e7b448c0 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - go-version: [1.23] + go-version: [1.26] steps: - uses: actions/setup-go@v6 @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v6 - uses: golangci/golangci-lint-action@v9 with: - version: v2.7 + version: v2.9 skip-cache: true args: --timeout=5m diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml index 9035eb9e..2c7873da 100644 --- a/.github/workflows/ci-build-image.yml +++ b/.github/workflows/ci-build-image.yml @@ -13,7 +13,7 @@ on: type: string env: - GO_VERSION: "1.23" + GO_VERSION: "1.26" OBD_VERSION: "1.0.12" jobs: diff --git a/.github/workflows/ci-unit-test.yml b/.github/workflows/ci-unit-test.yml index ea0a4bbb..c9da3984 100644 --- a/.github/workflows/ci-unit-test.yml +++ b/.github/workflows/ci-unit-test.yml @@ -22,7 +22,7 @@ jobs: - name: install Go uses: actions/setup-go@v6 with: - go-version: '1.23' + go-version: '1.26' - name: set env shell: bash diff --git a/.github/workflows/ci-userspace-convertor.yml b/.github/workflows/ci-userspace-convertor.yml index c970e8ae..de47619e 100644 --- a/.github/workflows/ci-userspace-convertor.yml +++ b/.github/workflows/ci-userspace-convertor.yml @@ -85,7 +85,7 @@ jobs: - name: install Go uses: actions/setup-go@v6 with: - go-version: '1.23' + go-version: '1.26' - name: set env shell: bash diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 809a4632..91327462 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: '1.23' + go-version: '1.26' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73ae9d6a..8b50aa6a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: - "v*" env: - GO_VERSION: "1.23" + GO_VERSION: "1.26" jobs: build: diff --git a/AGENTS.md b/AGENTS.md index 3b73717a..fd453911 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -121,7 +121,7 @@ Add to /etc/containerd/config.toml: ## Dependencies -- Go >= 1.23.x +- Go >= 1.26.x - containerd >= 2.0.x - runc >= 1.0 - overlaybd backstore (https://github.com/containerd/overlaybd) diff --git a/ci/e2e/go.mod b/ci/e2e/go.mod index 73da91d3..21c28480 100644 --- a/ci/e2e/go.mod +++ b/ci/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/accelerated-container-image/ci/e2e -go 1.23.0 +go 1.26.0 require ( github.com/containerd/containerd/v2 v2.0.7 diff --git a/cmd/convertor/resources/samples/run-userspace-convertor-ubuntu.Dockerfile b/cmd/convertor/resources/samples/run-userspace-convertor-ubuntu.Dockerfile index a779cc5d..cfa73526 100644 --- a/cmd/convertor/resources/samples/run-userspace-convertor-ubuntu.Dockerfile +++ b/cmd/convertor/resources/samples/run-userspace-convertor-ubuntu.Dockerfile @@ -19,9 +19,9 @@ RUN apt update && \ apt install -y pkg-config # Download and install Golang version 1.21 -RUN wget https://go.dev/dl/go1.23.2.linux-amd64.tar.gz && \ - tar -C /usr/local -xzf go1.23.2.linux-amd64.tar.gz && \ - rm go1.23.2.linux-amd64.tar.gz +RUN wget https://go.dev/dl/go1.26.0.linux-amd64.tar.gz && \ + tar -C /usr/local -xzf go1.26.0.linux-amd64.tar.gz && \ + rm go1.26.0.linux-amd64.tar.gz # Set environment variables ENV PATH="/usr/local/go/bin:${PATH}" diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 136ec1a5..731baaa3 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -11,7 +11,7 @@ This doc includes: ## Requirements -* Install Go >= 1.23.x +* Install Go >= 1.26.x * Install runc >= 1.0 * Install containerd >= 2.0.x * See [Downloads at containerd.io](https://containerd.io/downloads/). diff --git a/docs/QUICKSTART.md b/docs/QUICKSTART.md index 068db422..eea60ecc 100644 --- a/docs/QUICKSTART.md +++ b/docs/QUICKSTART.md @@ -37,7 +37,7 @@ Users can compile the latest code to install or download the [release](https://g #### Compile from source Install dependencies: -- golang 1.23+ +- golang 1.26+ Run the following commands to build: ```bash diff --git a/go.mod b/go.mod index 57e569e6..a514f6fd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containerd/accelerated-container-image -go 1.23.0 +go 1.26.0 require ( github.com/containerd/containerd/api v1.8.0 From 22bf634c1cbb06fc13d13794f2b2461a08835c0e Mon Sep 17 00:00:00 2001 From: Bin Du Date: Wed, 11 Feb 2026 13:22:36 -0800 Subject: [PATCH 2/2] fix lint Signed-off-by: Bin Du --- pkg/snapshot/storage.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/snapshot/storage.go b/pkg/snapshot/storage.go index 67484636..0bd1cb90 100644 --- a/pkg/snapshot/storage.go +++ b/pkg/snapshot/storage.go @@ -447,7 +447,7 @@ func (o *snapshotter) attachAndMountBlockDevice(ctx context.Context, snID string if err := lookup(o.overlaybdMountpoint(snID)); err == nil { return nil } else { - log.G(ctx).Infof(err.Error()) + log.G(ctx).Info(err.Error()) } device, err := AttachDevice(ctx, NewAttachDeviceParams(