Skip to content

Commit 0d12a51

Browse files
authored
fix: use local Go toolchain (#1546)
1 parent a48db94 commit 0d12a51

12 files changed

Lines changed: 19 additions & 9 deletions

.github/workflows/sanitizers.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
- "docs/**"
1414
permissions:
1515
contents: read
16+
env:
17+
GOTOOLCHAIN: local
1618
jobs:
1719
# Adapted from https://github.com/beberlei/hdrhistogram-php
1820
sanitizers:

.github/workflows/static.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ permissions:
2929
attestations: write
3030
env:
3131
IMAGE_NAME: ${{ (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version) || startsWith(github.ref, 'refs/tags/')) && 'dunglas/frankenphp' || 'dunglas/frankenphp-dev' }}
32+
GOTOOLCHAIN: local
3233
jobs:
3334
prepare:
3435
runs-on: ubuntu-24.04

.github/workflows/tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
- "docs/**"
1414
permissions:
1515
contents: read
16+
env:
17+
GOTOOLCHAIN: local
1618
jobs:
1719
tests-linux:
1820
name: Tests (Linux, PHP ${{ matrix.php-versions }})

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
5757
COPY --from=golang-base /usr/local/go /usr/local/go
5858

5959
ENV PATH=/usr/local/go/bin:$PATH
60+
ENV GOTOOLCHAIN=local
6061

6162
# This is required to link the FrankenPHP binary to the PHP binary
6263
RUN apt-get update && \

alpine.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
5757
COPY --link --from=golang-base /usr/local/go /usr/local/go
5858

5959
ENV PATH=/usr/local/go/bin:$PATH
60+
ENV GOTOOLCHAIN=local
6061

6162
# hadolint ignore=SC2086
6263
RUN apk add --no-cache --virtual .build-deps \

caddy/caddy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ func (f *FrankenPHPApp) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
343343
}
344344

345345
if f.MaxThreads > 0 && f.NumThreads > 0 && f.MaxThreads < f.NumThreads {
346-
return errors.New("'max_threads' must be greater than or equal to 'num_threads'")
346+
return errors.New(`"max_threads"" must be greater than or equal to "num_threads"`)
347347
}
348348

349349
return nil

caddy/go.mod

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

33
go 1.24.0
44

5-
toolchain go1.24.2
6-
75
replace github.com/dunglas/frankenphp => ../
86

97
retract v1.0.0-rc.1 // Human error

dev-alpine.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#checkov:skip=CKV_DOCKER_3
44
FROM golang:1.24-alpine
55

6+
ENV GOTOOLCHAIN=local
67
ENV CFLAGS="-ggdb3"
78
ENV PHPIZE_DEPS="\
89
autoconf \

dev.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#checkov:skip=CKV_DOCKER_3
44
FROM golang:1.24
55

6+
ENV GOTOOLCHAIN=local
67
ENV CFLAGS="-ggdb3"
78
ENV PHPIZE_DEPS="\
89
autoconf \

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
3+
go 1.24.0
44

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

0 commit comments

Comments
 (0)