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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: "Install go"
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
with:
go-version: "1.25"
go-version: "1.26"
check-latest: true
- name: "Compile binaries"
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/workflow-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
canary: true
with:
timeout: 10
go-version: "1.25"
go-version: "1.26"
runner: ubuntu-24.04
# Note: in GitHub yaml world, if `matrix.canary` is undefined, and is passed to `inputs.canary`, the job
# will not run. However, if you test it, it will coerce to `false`, hence:
Expand All @@ -48,7 +48,7 @@ jobs:
uses: ./.github/workflows/job-lint-project.yml
with:
timeout: 5
go-version: "1.25"
go-version: "1.26"
runner: ubuntu-24.04

# Lint for shell and yaml files
Expand All @@ -68,10 +68,10 @@ jobs:
matrix:
include:
# Build for both old and stable go
- go-version: "1.24"
- go-version: "1.25"
- go-version: "1.26"
# Additionally build for canary
- go-version: "1.25"
- go-version: "1.26"
canary: true
with:
timeout: 10
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
canary: ${{ matrix.canary && true || false }}
# Windows routinely go over 5 minutes
timeout: 10
go-version: 1.25
go-version: 1.26
windows-cni-version: v0.3.1
linux-cni-version: v1.7.1
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
runner: ${{ matrix.runner }}
binary: ${{ matrix.binary != '' && matrix.binary || 'nerdctl' }}
canary: ${{ matrix.canary && true || false }}
go-version: 1.25
go-version: 1.26
windows-cni-version: v0.3.1
docker-version: 5:28.0.4-1~ubuntu.24.04~noble
containerd-version: 2.2.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-tigron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
paths: 'mod/tigron/**'

env:
GO_VERSION: "1.25"
GO_VERSION: "1.26"
GOTOOLCHAIN: local

jobs:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ ARG GOMODJAIL_VERSION=v0.1.3@cea529ddd971b677c67d8af7e936fbc62b35b98c

# Test deps
# Currently, the Docker Official Images and the test deps are not pinned by the hash
ARG GO_VERSION=1.25
ARG GO_VERSION=1.26
ARG UBUNTU_VERSION=24.04
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
ARG GOTESTSUM_VERSION=v1.13.0
ARG NYDUS_VERSION=v2.3.9
ARG SOCI_SNAPSHOTTER_VERSION=0.12.1
ARG KUBO_VERSION=v0.39.0
ARG KUBO_VERSION=v0.40.1

FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.9.0@sha256:c64defb9ed5a91eacb37f96ccc3d4cd72521c4bd18d5442905b95e2226b0e707 AS xx

Expand Down
1 change: 1 addition & 0 deletions cmd/nerdctl/container/container_logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ bar

testCase := nerdtest.Setup()

testCase.Require = nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/4782")
if runtime.GOOS == "windows" {
testCase.Require = nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/4237")
}
Expand Down
1 change: 1 addition & 0 deletions cmd/nerdctl/container/container_run_systemd_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func TestRunWithSystemdTrueEnabled(t *testing.T) {
testCase.Require = require.All(
require.Amd64,
require.Not(nerdtest.Docker),
nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/4746"),
)

testCase.Setup = func(data test.Data, helpers test.Helpers) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/nerdctl/image/image_load_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestLoadStdinFromPipe(t *testing.T) {

testCase := &test.Case{
Description: "TestLoadStdinFromPipe",
Require: require.Linux,
Require: require.All(require.Linux, nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/4789")),
Setup: func(data test.Data, helpers test.Helpers) {
identifier := data.Identifier()
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
Expand Down
2 changes: 1 addition & 1 deletion hack/provisioning/kube/kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ readonly root
# shellcheck source=/dev/null
. "$root/../../scripts/lib.sh"

GO_VERSION=1.25
GO_VERSION=1.26
KIND_VERSION=v0.31.0
CNI_PLUGINS_VERSION=v1.9.1
# shellcheck disable=SC2034
Expand Down
2 changes: 1 addition & 1 deletion pkg/testutil/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fluentd:

golang:
ref: "golang"
tag: "1.25.0-trixie"
tag: "1.26.1-trixie"

kubo:
ref: "ghcr.io/stargz-containers/ipfs/kubo"
Expand Down
Loading