Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
go-version: [1.23]
go-version: [1.26]

steps:
- uses: actions/setup-go@v6
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
type: string

env:
GO_VERSION: "1.23"
GO_VERSION: "1.26"
OBD_VERSION: "1.0.12"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-userspace-convertor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "v*"

env:
GO_VERSION: "1.23"
GO_VERSION: "1.26"

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ci/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/containerd/accelerated-container-image/ci/e2e

go 1.23.0
go 1.26.0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the version is increasing, we should probably do a go mod tidy to upgrade the dependencies as well

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran the go mod tidy and go mod vendor. there is no change in go.sum


require (
github.com/containerd/containerd/v2 v2.0.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion docs/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This doc includes:

## Requirements

* Install Go >= 1.23.x
* Install Go >= 1.26.x

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why drop support for Go 1.25?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, Flatcar packages this project but wasn't ready to take 1.26, so we just patched it to 1.25 and nothing bad happened.

* Install runc >= 1.0
* Install containerd >= 2.0.x
* See [Downloads at containerd.io](https://containerd.io/downloads/).
Expand Down
2 changes: 1 addition & 1 deletion docs/QUICKSTART.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/snapshot/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading