Skip to content

Commit 5f153e0

Browse files
chore: upgrade to Go 1.25 (#1811)
* chore: upgrade to Go 1.25 * free all interned strings (test) * Revert "free all interned strings (test)" This reverts commit 34823ba. * Another test. * Another test * ASAN_OPTIONS: detect_leaks=0 * Update sanitizers.yaml * Update sanitizers.yaml * Update sanitizers.yaml --------- Co-authored-by: Alliballibaba <alliballibaba@gmail.com>
1 parent 555c613 commit 5f153e0

File tree

9 files changed

+11
-15
lines changed

9 files changed

+11
-15
lines changed

.github/workflows/sanitizers.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ jobs:
3535
USE_ZEND_ALLOC: 0
3636
LIBRARY_PATH: ${{ github.workspace }}/php/target/lib:${{ github.workspace }}/watcher/target/lib
3737
LD_LIBRARY_PATH: ${{ github.workspace }}/php/target/lib
38+
# PHP doesn't free some memory on purpose, we have to disable leaks detection: https://go.dev/doc/go1.25#go-command
39+
ASAN_OPTIONS: detect_leaks=0
3840
steps:
3941
- name: Remove local PHP
4042
run: sudo apt-get remove --purge --autoremove 'php*' 'libmemcached*'
4143
- uses: actions/checkout@v4
4244
- uses: actions/setup-go@v5
4345
with:
44-
go-version: "1.24"
46+
go-version: "1.25"
4547
cache-dependency-path: |
4648
go.sum
4749
caddy/go.sum

.github/workflows/static.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ jobs:
371371
ref: ${{ needs.prepare.outputs.ref }}
372372
- uses: actions/setup-go@v5
373373
with:
374-
go-version: "1.24"
374+
go-version: "1.25"
375375
cache-dependency-path: |
376376
go.sum
377377
caddy/go.sum

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v4
3535
- uses: actions/setup-go@v5
3636
with:
37-
go-version: "1.24"
37+
go-version: "1.25"
3838
cache-dependency-path: |
3939
go.sum
4040
caddy/go.sum
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/checkout@v4
8989
- uses: actions/setup-go@v5
9090
with:
91-
go-version: "1.24"
91+
go-version: "1.25"
9292
cache-dependency-path: |
9393
go.sum
9494
caddy/go.sum

caddy/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/dunglas/frankenphp/caddy
22

3-
go 1.24.0
3+
go 1.25.0
44

55
replace github.com/dunglas/frankenphp => ../
66

dev-alpine.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
#checkov:skip=CKV_DOCKER_2
33
#checkov:skip=CKV_DOCKER_3
4-
FROM golang:1.24-alpine
4+
FROM golang:1.25-alpine
55

66
ENV GOTOOLCHAIN=local
77
ENV CFLAGS="-ggdb3"

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22
#checkov:skip=CKV_DOCKER_2
33
#checkov:skip=CKV_DOCKER_3
4-
FROM golang:1.24
4+
FROM golang:1.25
55

66
ENV GOTOOLCHAIN=local
77
ENV CFLAGS="-ggdb3"

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variable "PHP_VERSION" {
1111
}
1212

1313
variable "GO_VERSION" {
14-
default = "1.24"
14+
default = "1.25"
1515
}
1616

1717
variable "SHA" {}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/dunglas/frankenphp
22

3-
go 1.24.0
3+
go 1.25.0
44

55
retract v1.0.0-rc.1 // Human error
66

go.sum

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
4040
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
4141
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4242
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
43-
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
44-
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
4543
github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
4644
github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
4745
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -70,14 +68,10 @@ golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
7068
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
7169
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
7270
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
73-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
74-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
7571
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
7672
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
7773
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
7874
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
79-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
80-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
8175
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
8276
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
8377
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)