Skip to content

Commit b20740d

Browse files
masa213fmasa213f
authored
Merge pull request #35 from cybozu-go/update-202511
Update dependencies
2 parents 37dcf54 + 9e4bc30 commit b20740d

File tree

7 files changed

+96
-76
lines changed

7 files changed

+96
-76
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
name: Build binaries
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-go@v5
12+
- uses: actions/checkout@v5
13+
- uses: actions/setup-go@v6
1414
with:
1515
go-version-file: "go.mod"
1616
- run: make lint
@@ -19,8 +19,8 @@ jobs:
1919
name: Small tests
2020
runs-on: ubuntu-24.04
2121
steps:
22-
- uses: actions/checkout@v4
23-
- uses: actions/setup-go@v5
22+
- uses: actions/checkout@v5
23+
- uses: actions/setup-go@v6
2424
with:
2525
go-version-file: "go.mod"
2626
- run: make test
@@ -29,8 +29,8 @@ jobs:
2929
name: End-to-end tests
3030
runs-on: ubuntu-24.04
3131
steps:
32-
- uses: actions/checkout@v4
33-
- uses: actions/setup-go@v5
32+
- uses: actions/checkout@v5
33+
- uses: actions/setup-go@v6
3434
with:
3535
go-version-file: "go.mod"
3636
- run: make setup

‎.github/workflows/mdbook.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
name: Build book
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- run: make book
14-
- uses: actions/upload-artifact@v4
14+
- uses: actions/upload-artifact@v5
1515
with:
1616
name: book
1717
path: docs/book
@@ -21,12 +21,12 @@ jobs:
2121
runs-on: ubuntu-24.04
2222
needs: build
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
with:
2626
ref: gh-pages
2727
# do not remove helm chart related files if present
2828
- run: ls | grep -v -E "index.yaml|.*\.tgz" | xargs rm -rf
29-
- uses: actions/download-artifact@v4
29+
- uses: actions/download-artifact@v6
3030
with:
3131
name: book
3232
- run: git add .

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
contents: read
1212
packages: write
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Get version
1616
id: get_version
1717
run: |
@@ -50,7 +50,7 @@ jobs:
5050
permissions:
5151
contents: write
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454
- name: Create Release
5555
env:
5656
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -68,7 +68,7 @@ jobs:
6868
if: contains(needs.release.result, 'success')
6969
steps:
7070
- name: Checkout
71-
uses: actions/checkout@v4
71+
uses: actions/checkout@v5
7272
with:
7373
fetch-depth: 0
7474
- name: Create release notes

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include ./Makefile.common
2-
ENVTEST_K8S_VERSION = 1.34.0
2+
ENVTEST_K8S_VERSION = 1.34.1
33

44
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
55
ifeq (,$(shell go env GOBIN))
@@ -145,15 +145,15 @@ KAPTEST ?= $(LOCALBIN)/kaptest
145145
YQ ?= $(LOCALBIN)/yq
146146

147147
## Tool Versions
148-
KUSTOMIZE_VERSION ?= v5.7.1
148+
KUSTOMIZE_VERSION ?= v5.8.0
149149
CONTROLLER_TOOLS_VERSION ?= v0.19.0
150150
ENVTEST_VERSION ?= release-0.22
151-
GOLANGCI_LINT_VERSION ?= 2.5.0
152-
GINKGO_VERSION ?= v2.25.3
153-
CODE_GENERATOR_VERSION ?= v0.34.1
154-
MODELS_SCHEMA_VERSION ?= v1.34.1
151+
GOLANGCI_LINT_VERSION ?= 2.6.2
152+
GINKGO_VERSION ?= v2.27.2
153+
CODE_GENERATOR_VERSION ?= v0.34.2
154+
MODELS_SCHEMA_VERSION ?= v1.34.2
155155
KAPTEST_VERSION ?= v0.1.2
156-
YQ_VERSION ?= v4.47.2
156+
YQ_VERSION ?= v4.48.2
157157

158158
.PHONY: kustomize
159159
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

‎go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
module github.com/cybozu-go/ofen
22

3-
go 1.25.1
3+
go 1.25.4
44

55
require (
6-
github.com/containerd/containerd/api v1.9.0
7-
github.com/containerd/containerd/v2 v2.1.4
6+
github.com/containerd/containerd/api v1.10.0
7+
github.com/containerd/containerd/v2 v2.2.0
88
github.com/containerd/errdefs v1.0.0
99
github.com/containerd/typeurl/v2 v2.2.3
1010
github.com/go-logr/logr v1.4.3
11-
github.com/onsi/ginkgo/v2 v2.25.3
11+
github.com/onsi/ginkgo/v2 v2.27.2
1212
github.com/onsi/gomega v1.38.2
1313
github.com/prometheus/client_golang v1.23.2
1414
github.com/stretchr/testify v1.11.1
15-
k8s.io/api v0.34.1
16-
k8s.io/apimachinery v0.34.1
17-
k8s.io/client-go v0.34.1
18-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
19-
sigs.k8s.io/controller-runtime v0.22.1
15+
k8s.io/api v0.34.2
16+
k8s.io/apimachinery v0.34.2
17+
k8s.io/client-go v0.34.2
18+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
19+
sigs.k8s.io/controller-runtime v0.22.4
2020
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
2121
)
2222

2323
require (
2424
cel.dev/expr v0.24.0 // indirect
2525
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2626
github.com/Microsoft/go-winio v0.6.2 // indirect
27-
github.com/Microsoft/hcsshim v0.13.0 // indirect
27+
github.com/Microsoft/hcsshim v0.14.0-rc.1 // indirect
2828
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
3131
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3232
github.com/cespare/xxhash/v2 v2.3.0 // indirect
33-
github.com/containerd/cgroups/v3 v3.0.5 // indirect
33+
github.com/containerd/cgroups/v3 v3.1.0 // indirect
3434
github.com/containerd/continuity v0.4.5 // indirect
3535
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3636
github.com/containerd/fifo v1.1.0 // indirect
3737
github.com/containerd/log v0.1.0 // indirect
38-
github.com/containerd/platforms v1.0.0-rc.1 // indirect
38+
github.com/containerd/platforms v1.0.0-rc.2 // indirect
3939
github.com/containerd/plugin v1.0.0 // indirect
4040
github.com/containerd/ttrpc v1.2.7 // indirect
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -74,7 +74,7 @@ require (
7474
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7575
github.com/josharian/intern v1.0.0 // indirect
7676
github.com/json-iterator/go v1.1.12 // indirect
77-
github.com/klauspost/compress v1.18.0 // indirect
77+
github.com/klauspost/compress v1.18.1 // indirect
7878
github.com/mailru/easyjson v0.9.0 // indirect
7979
github.com/moby/locker v1.0.1 // indirect
8080
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -110,25 +110,25 @@ require (
110110
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
111111
go.opentelemetry.io/otel/trace v1.38.0 // indirect
112112
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
113-
go.uber.org/automaxprocs v1.6.0 // indirect
114113
go.uber.org/multierr v1.11.0 // indirect
115114
go.uber.org/zap v1.27.0 // indirect
116115
go.yaml.in/yaml/v2 v2.4.3 // indirect
117116
go.yaml.in/yaml/v3 v3.0.4 // indirect
118117
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
118+
golang.org/x/mod v0.29.0 // indirect
119119
golang.org/x/net v0.44.0 // indirect
120120
golang.org/x/oauth2 v0.31.0 // indirect
121121
golang.org/x/sync v0.17.0 // indirect
122-
golang.org/x/sys v0.36.0 // indirect
122+
golang.org/x/sys v0.37.0 // indirect
123123
golang.org/x/term v0.35.0 // indirect
124124
golang.org/x/text v0.29.0 // indirect
125-
golang.org/x/time v0.13.0 // indirect
125+
golang.org/x/time v0.14.0 // indirect
126126
golang.org/x/tools v0.37.0 // indirect
127127
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
128128
google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect
129129
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
130-
google.golang.org/grpc v1.75.1 // indirect
131-
google.golang.org/protobuf v1.36.9 // indirect
130+
google.golang.org/grpc v1.76.0 // indirect
131+
google.golang.org/protobuf v1.36.10 // indirect
132132
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
133133
gopkg.in/inf.v0 v0.9.1 // indirect
134134
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)