Skip to content

Commit 149d3fb

Browse files
authored
Merge pull request #4806 from AkihiroSuda/go1.26
CI: update Go (1.26); mark several tests flaky
2 parents 892a68c + afbfb77 commit 149d3fb

File tree

10 files changed

+15
-13
lines changed

10 files changed

+15
-13
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: "Install go"
3131
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3232
with:
33-
go-version: "1.25"
33+
go-version: "1.26"
3434
check-latest: true
3535
- name: "Compile binaries"
3636
env:

.github/workflows/workflow-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
canary: true
3636
with:
3737
timeout: 10
38-
go-version: "1.25"
38+
go-version: "1.26"
3939
runner: ubuntu-24.04
4040
# Note: in GitHub yaml world, if `matrix.canary` is undefined, and is passed to `inputs.canary`, the job
4141
# will not run. However, if you test it, it will coerce to `false`, hence:
@@ -48,7 +48,7 @@ jobs:
4848
uses: ./.github/workflows/job-lint-project.yml
4949
with:
5050
timeout: 5
51-
go-version: "1.25"
51+
go-version: "1.26"
5252
runner: ubuntu-24.04
5353

5454
# Lint for shell and yaml files
@@ -68,10 +68,10 @@ jobs:
6868
matrix:
6969
include:
7070
# Build for both old and stable go
71-
- go-version: "1.24"
7271
- go-version: "1.25"
72+
- go-version: "1.26"
7373
# Additionally build for canary
74-
- go-version: "1.25"
74+
- go-version: "1.26"
7575
canary: true
7676
with:
7777
timeout: 10

.github/workflows/workflow-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
canary: ${{ matrix.canary && true || false }}
3131
# Windows routinely go over 5 minutes
3232
timeout: 10
33-
go-version: 1.25
33+
go-version: 1.26
3434
windows-cni-version: v0.3.1
3535
linux-cni-version: v1.7.1
3636
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098
@@ -143,7 +143,7 @@ jobs:
143143
runner: ${{ matrix.runner }}
144144
binary: ${{ matrix.binary != '' && matrix.binary || 'nerdctl' }}
145145
canary: ${{ matrix.canary && true || false }}
146-
go-version: 1.25
146+
go-version: 1.26
147147
windows-cni-version: v0.3.1
148148
docker-version: 5:28.0.4-1~ubuntu.24.04~noble
149149
containerd-version: 2.2.1

.github/workflows/workflow-tigron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
paths: 'mod/tigron/**'
1010

1111
env:
12-
GO_VERSION: "1.25"
12+
GO_VERSION: "1.26"
1313
GOTOOLCHAIN: local
1414

1515
jobs:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ ARG GOMODJAIL_VERSION=v0.1.3@cea529ddd971b677c67d8af7e936fbc62b35b98c
4444

4545
# Test deps
4646
# Currently, the Docker Official Images and the test deps are not pinned by the hash
47-
ARG GO_VERSION=1.25
47+
ARG GO_VERSION=1.26
4848
ARG UBUNTU_VERSION=24.04
4949
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
5050
ARG GOTESTSUM_VERSION=v1.13.0
5151
ARG NYDUS_VERSION=v2.3.9
5252
ARG SOCI_SNAPSHOTTER_VERSION=0.12.1
53-
ARG KUBO_VERSION=v0.39.0
53+
ARG KUBO_VERSION=v0.40.1
5454

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

cmd/nerdctl/container/container_logs_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ bar
4444

4545
testCase := nerdtest.Setup()
4646

47+
testCase.Require = nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/4782")
4748
if runtime.GOOS == "windows" {
4849
testCase.Require = nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/4237")
4950
}

cmd/nerdctl/container/container_run_systemd_linux_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ func TestRunWithSystemdTrueEnabled(t *testing.T) {
7070
testCase.Require = require.All(
7171
require.Amd64,
7272
require.Not(nerdtest.Docker),
73+
nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/4746"),
7374
)
7475

7576
testCase.Setup = func(data test.Data, helpers test.Helpers) {

cmd/nerdctl/image/image_load_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestLoadStdinFromPipe(t *testing.T) {
3838

3939
testCase := &test.Case{
4040
Description: "TestLoadStdinFromPipe",
41-
Require: require.Linux,
41+
Require: require.All(require.Linux, nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/4789")),
4242
Setup: func(data test.Data, helpers test.Helpers) {
4343
identifier := data.Identifier()
4444
helpers.Ensure("pull", "--quiet", testutil.CommonImage)

hack/provisioning/kube/kind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ readonly root
2020
# shellcheck source=/dev/null
2121
. "$root/../../scripts/lib.sh"
2222

23-
GO_VERSION=1.25
23+
GO_VERSION=1.26
2424
KIND_VERSION=v0.31.0
2525
CNI_PLUGINS_VERSION=v1.9.1
2626
# shellcheck disable=SC2034

pkg/testutil/images.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fluentd:
3232

3333
golang:
3434
ref: "golang"
35-
tag: "1.25.0-trixie"
35+
tag: "1.26.1-trixie"
3636

3737
kubo:
3838
ref: "ghcr.io/stargz-containers/ipfs/kubo"

0 commit comments

Comments
 (0)