Skip to content

Commit f61bc18

Browse files
committed
chore: upgrade to Go 1.24
1 parent 9f5e7a9 commit f61bc18

10 files changed

Lines changed: 141 additions & 129 deletions

File tree

.github/workflows/sanitizers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737
- uses: actions/setup-go@v5
3838
with:
39-
go-version: "1.22"
39+
go-version: "1.24"
4040
cache-dependency-path: |
4141
go.sum
4242
caddy/go.sum

.github/workflows/static.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
ref: ${{ needs.prepare.outputs.ref }}
229229
- uses: actions/setup-go@v5
230230
with:
231-
go-version: "1.22"
231+
go-version: "1.24"
232232
cache-dependency-path: |
233233
go.sum
234234
caddy/go.sum

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v4
2929
- uses: actions/setup-go@v5
3030
with:
31-
go-version: "1.22"
31+
go-version: "1.24"
3232
cache-dependency-path: |
3333
go.sum
3434
caddy/go.sum

caddy/go.mod

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/dunglas/frankenphp/caddy
22

3-
go 1.22.7
3+
go 1.23.0
4+
5+
toolchain go1.24.0
46

57
replace github.com/dunglas/frankenphp => ../
68

@@ -11,18 +13,18 @@ require (
1113
github.com/caddyserver/certmagic v0.21.7
1214
github.com/dunglas/caddy-cbrotli v1.0.0
1315
github.com/dunglas/frankenphp v1.4.2
14-
github.com/dunglas/mercure/caddy v0.18.2
16+
github.com/dunglas/mercure/caddy v0.18.3
1517
github.com/dunglas/vulcain/caddy v1.1.1
1618
github.com/prometheus/client_golang v1.20.5
17-
github.com/spf13/cobra v1.8.1
19+
github.com/spf13/cobra v1.9.1
1820
github.com/stretchr/testify v1.10.0
1921
go.uber.org/zap v1.27.0
2022
)
2123

2224
require github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 // indirect
2325

2426
require (
25-
cel.dev/expr v0.19.2 // indirect
27+
cel.dev/expr v0.20.0 // indirect
2628
dario.cat/mergo v1.0.1 // indirect
2729
filippo.io/edwards25519 v1.1.0 // indirect
2830
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
@@ -52,10 +54,10 @@ require (
5254
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
5355
github.com/dgraph-io/ristretto v0.2.0 // indirect
5456
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
55-
github.com/dlclark/regexp2 v1.11.4 // indirect
57+
github.com/dlclark/regexp2 v1.11.5 // indirect
5658
github.com/dolthub/maphash v0.1.0 // indirect
5759
github.com/dunglas/httpsfv v1.0.2 // indirect
58-
github.com/dunglas/mercure v0.18.2 // indirect
60+
github.com/dunglas/mercure v0.18.3 // indirect
5961
github.com/dunglas/vulcain v1.1.1 // indirect
6062
github.com/dustin/go-humanize v1.0.1 // indirect
6163
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -78,11 +80,11 @@ require (
7880
github.com/golang/protobuf v1.5.4 // indirect
7981
github.com/golang/snappy v0.0.4 // indirect
8082
github.com/google/brotli/go/cbrotli v0.0.0-20241111155135-4303850b01d6 // indirect
81-
github.com/google/cel-go v0.23.0 // indirect
83+
github.com/google/cel-go v0.23.2 // indirect
8284
github.com/google/certificate-transparency-go v1.3.0 // indirect
8385
github.com/google/go-tpm v0.9.3 // indirect
8486
github.com/google/go-tspi v0.3.0 // indirect
85-
github.com/google/pprof v0.0.0-20250125003558-7fdb3d7e6fa0 // indirect
87+
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
8688
github.com/google/uuid v1.6.0 // indirect
8789
github.com/gorilla/handlers v1.5.2 // indirect
8890
github.com/gorilla/mux v1.8.1 // indirect
@@ -101,7 +103,7 @@ require (
101103
github.com/klauspost/compress v1.17.11 // indirect
102104
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
103105
github.com/kylelemons/godebug v1.1.0 // indirect
104-
github.com/libdns/libdns v0.2.2 // indirect
106+
github.com/libdns/libdns v0.2.3 // indirect
105107
github.com/magiconair/properties v1.8.9 // indirect
106108
github.com/mailru/easyjson v0.9.0 // indirect
107109
github.com/manifoldco/promptui v0.9.0 // indirect
@@ -140,13 +142,13 @@ require (
140142
github.com/smallstep/certificates v0.28.1 // indirect
141143
github.com/smallstep/cli-utils v0.10.0 // indirect
142144
github.com/smallstep/nosql v0.7.0 // indirect
143-
github.com/smallstep/pkcs7 v0.1.1 // indirect
145+
github.com/smallstep/pkcs7 v0.2.1 // indirect
144146
github.com/smallstep/scep v0.0.0-20241223071629-a37a330173bc // indirect
145147
github.com/smallstep/truststore v0.13.0 // indirect
146148
github.com/sourcegraph/conc v0.3.0 // indirect
147149
github.com/spf13/afero v1.12.0 // indirect
148150
github.com/spf13/cast v1.7.1 // indirect
149-
github.com/spf13/pflag v1.0.5 // indirect
151+
github.com/spf13/pflag v1.0.6 // indirect
150152
github.com/spf13/viper v1.19.0 // indirect
151153
github.com/stoewer/go-strcase v1.3.0 // indirect
152154
github.com/subosito/gotenv v1.6.0 // indirect
@@ -162,7 +164,7 @@ require (
162164
github.com/yuin/goldmark v1.7.8 // indirect
163165
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
164166
github.com/zeebo/blake3 v0.2.4 // indirect
165-
go.etcd.io/bbolt v1.3.11 // indirect
167+
go.etcd.io/bbolt v1.4.0 // indirect
166168
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
167169
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
168170
go.opentelemetry.io/contrib/propagators/autoprop v0.58.0 // indirect
@@ -177,28 +179,28 @@ require (
177179
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
178180
go.opentelemetry.io/otel/trace v1.33.0 // indirect
179181
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
180-
go.step.sm/crypto v0.57.0 // indirect
182+
go.step.sm/crypto v0.57.1 // indirect
181183
go.step.sm/linkedca v0.22.2 // indirect
182184
go.uber.org/automaxprocs v1.6.0 // indirect
183185
go.uber.org/mock v0.5.0 // indirect
184186
go.uber.org/multierr v1.11.0 // indirect
185187
go.uber.org/zap/exp v0.3.0 // indirect
186-
golang.org/x/crypto v0.32.0 // indirect
187-
golang.org/x/crypto/x509roots/fallback v0.0.0-20250118192723-a8ea4be81f07 // indirect
188-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
189-
golang.org/x/mod v0.22.0 // indirect
190-
golang.org/x/net v0.34.0 // indirect
191-
golang.org/x/oauth2 v0.25.0 // indirect
192-
golang.org/x/sync v0.10.0 // indirect
193-
golang.org/x/sys v0.29.0 // indirect
194-
golang.org/x/term v0.28.0 // indirect
195-
golang.org/x/text v0.21.0 // indirect
196-
golang.org/x/time v0.9.0 // indirect
197-
golang.org/x/tools v0.29.0 // indirect
198-
google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 // indirect
199-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
188+
golang.org/x/crypto v0.33.0 // indirect
189+
golang.org/x/crypto/x509roots/fallback v0.0.0-20250214233241-911360c8a4f4 // indirect
190+
golang.org/x/exp v0.0.0-20250215185904-eff6e970281f // indirect
191+
golang.org/x/mod v0.23.0 // indirect
192+
golang.org/x/net v0.35.0 // indirect
193+
golang.org/x/oauth2 v0.26.0 // indirect
194+
golang.org/x/sync v0.11.0 // indirect
195+
golang.org/x/sys v0.30.0 // indirect
196+
golang.org/x/term v0.29.0 // indirect
197+
golang.org/x/text v0.22.0 // indirect
198+
golang.org/x/time v0.10.0 // indirect
199+
golang.org/x/tools v0.30.0 // indirect
200+
google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b // indirect
201+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
200202
google.golang.org/grpc v1.70.0 // indirect
201-
google.golang.org/protobuf v1.36.4 // indirect
203+
google.golang.org/protobuf v1.36.5 // indirect
202204
gopkg.in/ini.v1 v1.67.0 // indirect
203205
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
204206
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)