Skip to content

Commit a2c0f38

Browse files
authored
chore: upgrade to Go 1.24 (#1008)
* chore: upgrade to Go 1.24 * ci: fix goreleaser deprecations
1 parent 53f2d85 commit a2c0f38

File tree

8 files changed

+159
-164
lines changed

8 files changed

+159
-164
lines changed

.github/workflows/cd.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ permissions:
1717
id-token: write
1818
attestations: write
1919

20+
env:
21+
GOTOOLCHAIN: local
22+
2023
jobs:
2124
release:
2225
runs-on: ubuntu-latest
@@ -29,7 +32,8 @@ jobs:
2932
- name: Set up Go
3033
uses: actions/setup-go@v5
3134
with:
32-
go-version: "1.23"
35+
go-version: "1.24"
36+
check-latest: true
3337
cache-dependency-path: |
3438
go.sum
3539
caddy/go.sum

.github/workflows/ci.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- v*.*.*
1212

1313
env:
14-
GO111MODULE: "on"
14+
GOTOOLCHAIN: local
1515

1616
jobs:
1717
golangci:
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v5
2525
with:
26-
go-version: "1.23"
26+
go-version: "1.24"
2727
cache-dependency-path: |
2828
go.sum
2929
caddy/go.sum
@@ -37,13 +37,10 @@ jobs:
3737
test:
3838
strategy:
3939
matrix:
40-
go: ["1.21", "1.22", "1.23"]
40+
go: ["1.23", "1.24"]
4141
fail-fast: false
4242
name: Test
4343
runs-on: ubuntu-latest
44-
env:
45-
# Temporary workaround for https://github.com/golang/go/issues/65653
46-
GOEXPERIMENT: nocoverageredesign
4744
steps:
4845
- name: Checkout
4946
uses: actions/checkout@v4
@@ -57,8 +54,6 @@ jobs:
5754
caddy/go.sum
5855
5956
- name: Use go-deadlock
60-
# Blocked by https://github.com/sasha-s/go-deadlock/issues/34
61-
if: matrix.go != '1.23'
6257
run: ./tests/use-go-deadlock.sh
6358

6459
- name: Test

.goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ archives:
7171
- dev.Caddyfile
7272
format_overrides:
7373
- goos: windows
74-
format: zip
74+
formats: [ zip ]
7575
- id: legacy
7676
builds:
7777
- legacy
@@ -88,7 +88,7 @@ archives:
8888
- README.md
8989
format_overrides:
9090
- goos: windows
91-
format: zip
91+
formats: [ zip ]
9292
dockers:
9393
- ids:
9494
- caddy

caddy/go.mod

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

3-
go 1.22.7
3+
go 1.23.0
44

5-
toolchain go1.23.2
5+
toolchain go1.24.0
66

77
retract (
88
v0.14.7 // CI problem
@@ -15,13 +15,12 @@ require (
1515
github.com/MicahParks/keyfunc/v3 v3.3.10
1616
github.com/caddyserver/caddy/v2 v2.9.1
1717
github.com/dunglas/mercure v0.18.2
18-
github.com/prometheus/client_golang v1.20.5
1918
github.com/stretchr/testify v1.10.0
2019
go.uber.org/zap v1.27.0
2120
)
2221

2322
require (
24-
cel.dev/expr v0.19.2 // indirect
23+
cel.dev/expr v0.20.0 // indirect
2524
dario.cat/mergo v1.0.1 // indirect
2625
filippo.io/edwards25519 v1.1.0 // indirect
2726
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
@@ -68,11 +67,11 @@ require (
6867
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
6968
github.com/golang/protobuf v1.5.4 // indirect
7069
github.com/golang/snappy v0.0.4 // indirect
71-
github.com/google/cel-go v0.23.0 // indirect
70+
github.com/google/cel-go v0.23.2 // indirect
7271
github.com/google/certificate-transparency-go v1.2.2 // indirect
7372
github.com/google/go-tpm v0.9.3 // indirect
7473
github.com/google/go-tspi v0.3.0 // indirect
75-
github.com/google/pprof v0.0.0-20250125003558-7fdb3d7e6fa0 // indirect
74+
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
7675
github.com/google/uuid v1.6.0 // indirect
7776
github.com/gorilla/handlers v1.5.2 // indirect
7877
github.com/gorilla/mux v1.8.1 // indirect
@@ -88,7 +87,7 @@ require (
8887
github.com/kevburnsjr/skipfilter v0.0.1 // indirect
8988
github.com/klauspost/compress v1.17.11 // indirect
9089
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
91-
github.com/libdns/libdns v0.2.2 // indirect
90+
github.com/libdns/libdns v0.2.3 // indirect
9291
github.com/magiconair/properties v1.8.9 // indirect
9392
github.com/manifoldco/promptui v0.9.0 // indirect
9493
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -107,6 +106,7 @@ require (
107106
github.com/pires/go-proxyproto v0.8.0 // indirect
108107
github.com/pkg/errors v0.9.1 // indirect
109108
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
109+
github.com/prometheus/client_golang v1.20.5 // indirect
110110
github.com/prometheus/client_model v0.6.1 // indirect
111111
github.com/prometheus/common v0.62.0 // indirect
112112
github.com/prometheus/procfs v0.15.1 // indirect
@@ -124,14 +124,14 @@ require (
124124
github.com/smallstep/cli-utils v0.10.0 // indirect
125125
github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 // indirect
126126
github.com/smallstep/nosql v0.7.0 // indirect
127-
github.com/smallstep/pkcs7 v0.1.1 // indirect
127+
github.com/smallstep/pkcs7 v0.2.1 // indirect
128128
github.com/smallstep/scep v0.0.0-20241223071629-a37a330173bc // indirect
129129
github.com/smallstep/truststore v0.13.0 // indirect
130130
github.com/sourcegraph/conc v0.3.0 // indirect
131131
github.com/spf13/afero v1.12.0 // indirect
132132
github.com/spf13/cast v1.7.1 // indirect
133-
github.com/spf13/cobra v1.8.1 // indirect
134-
github.com/spf13/pflag v1.0.5 // indirect
133+
github.com/spf13/cobra v1.9.1 // indirect
134+
github.com/spf13/pflag v1.0.6 // indirect
135135
github.com/spf13/viper v1.19.0 // indirect
136136
github.com/stoewer/go-strcase v1.3.0 // indirect
137137
github.com/subosito/gotenv v1.6.0 // indirect
@@ -143,7 +143,7 @@ require (
143143
github.com/yuin/goldmark v1.7.8 // indirect
144144
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
145145
github.com/zeebo/blake3 v0.2.4 // indirect
146-
go.etcd.io/bbolt v1.3.11 // indirect
146+
go.etcd.io/bbolt v1.4.0 // indirect
147147
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
148148
go.opentelemetry.io/contrib/propagators/autoprop v0.57.0 // indirect
149149
go.opentelemetry.io/contrib/propagators/aws v1.32.0 // indirect
@@ -157,28 +157,28 @@ require (
157157
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
158158
go.opentelemetry.io/otel/trace v1.32.0 // indirect
159159
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
160-
go.step.sm/crypto v0.57.0 // indirect
160+
go.step.sm/crypto v0.57.1 // indirect
161161
go.step.sm/linkedca v0.22.2 // indirect
162162
go.uber.org/automaxprocs v1.6.0 // indirect
163163
go.uber.org/mock v0.5.0 // indirect
164164
go.uber.org/multierr v1.11.0 // indirect
165165
go.uber.org/zap/exp v0.3.0 // indirect
166-
golang.org/x/crypto v0.32.0 // indirect
167-
golang.org/x/crypto/x509roots/fallback v0.0.0-20250118192723-a8ea4be81f07 // indirect
168-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
169-
golang.org/x/mod v0.22.0 // indirect
170-
golang.org/x/net v0.34.0 // indirect
171-
golang.org/x/oauth2 v0.25.0 // indirect
172-
golang.org/x/sync v0.10.0 // indirect
173-
golang.org/x/sys v0.29.0 // indirect
174-
golang.org/x/term v0.28.0 // indirect
175-
golang.org/x/text v0.21.0 // indirect
176-
golang.org/x/time v0.9.0 // indirect
177-
golang.org/x/tools v0.29.0 // indirect
178-
google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 // indirect
179-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
166+
golang.org/x/crypto v0.33.0 // indirect
167+
golang.org/x/crypto/x509roots/fallback v0.0.0-20250214233241-911360c8a4f4 // indirect
168+
golang.org/x/exp v0.0.0-20250215185904-eff6e970281f // indirect
169+
golang.org/x/mod v0.23.0 // indirect
170+
golang.org/x/net v0.35.0 // indirect
171+
golang.org/x/oauth2 v0.26.0 // indirect
172+
golang.org/x/sync v0.11.0 // indirect
173+
golang.org/x/sys v0.30.0 // indirect
174+
golang.org/x/term v0.29.0 // indirect
175+
golang.org/x/text v0.22.0 // indirect
176+
golang.org/x/time v0.10.0 // indirect
177+
golang.org/x/tools v0.30.0 // indirect
178+
google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b // indirect
179+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
180180
google.golang.org/grpc v1.70.0 // indirect
181-
google.golang.org/protobuf v1.36.4 // indirect
181+
google.golang.org/protobuf v1.36.5 // indirect
182182
gopkg.in/ini.v1 v1.67.0 // indirect
183183
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
184184
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)