diff --git a/examples/envoy-ext-auth/Dockerfile b/examples/envoy-ext-auth/Dockerfile index a9985defb0..afec60df0c 100644 --- a/examples/envoy-ext-auth/Dockerfile +++ b/examples/envoy-ext-auth/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.8 AS builder +FROM golang:1.25.3 AS builder ARG GO_LDFLAGS="" diff --git a/examples/envoy-ext-auth/go.mod b/examples/envoy-ext-auth/go.mod index 1ca9d2ce1c..94ccf807d5 100644 --- a/examples/envoy-ext-auth/go.mod +++ b/examples/envoy-ext-auth/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway-grcp-ext-auth -go 1.24.8 +go 1.25.3 require ( github.com/envoyproxy/go-control-plane/envoy v1.35.0 diff --git a/examples/extension-server/go.mod b/examples/extension-server/go.mod index 0c4edb7f58..a70e5ecdcf 100644 --- a/examples/extension-server/go.mod +++ b/examples/extension-server/go.mod @@ -1,6 +1,6 @@ module github.com/exampleorg/envoygateway-extension -go 1.24.8 +go 1.25.3 require ( github.com/envoyproxy/gateway v1.3.1 diff --git a/examples/grpc-ext-proc/Dockerfile b/examples/grpc-ext-proc/Dockerfile index 1c0bcbaca6..d527a3b442 100644 --- a/examples/grpc-ext-proc/Dockerfile +++ b/examples/grpc-ext-proc/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.8 AS builder +FROM golang:1.25.3 AS builder ARG GO_LDFLAGS="" diff --git a/examples/grpc-ext-proc/go.mod b/examples/grpc-ext-proc/go.mod index 272db4c7bb..2b9c0c3818 100644 --- a/examples/grpc-ext-proc/go.mod +++ b/examples/grpc-ext-proc/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway-grpc-ext-proc -go 1.24.8 +go 1.25.3 require ( github.com/envoyproxy/go-control-plane/envoy v1.35.0 diff --git a/examples/preserve-case-backend/Dockerfile b/examples/preserve-case-backend/Dockerfile index 2c73a9300e..5507788e3b 100644 --- a/examples/preserve-case-backend/Dockerfile +++ b/examples/preserve-case-backend/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.8 AS builder +FROM golang:1.25.3 AS builder ARG GO_LDFLAGS="" diff --git a/examples/preserve-case-backend/go.mod b/examples/preserve-case-backend/go.mod index 65eb062d21..7eeafe075b 100644 --- a/examples/preserve-case-backend/go.mod +++ b/examples/preserve-case-backend/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway-preserve-case-backend -go 1.24.8 +go 1.25.3 require github.com/valyala/fasthttp v1.67.0 diff --git a/examples/simple-extension-server/Dockerfile b/examples/simple-extension-server/Dockerfile index 393e6404e2..fc988f07eb 100644 --- a/examples/simple-extension-server/Dockerfile +++ b/examples/simple-extension-server/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.8 AS builder +FROM golang:1.25.3 AS builder ARG GO_LDFLAGS="" diff --git a/examples/simple-extension-server/go.mod b/examples/simple-extension-server/go.mod index b983c93f74..1e6631c30b 100644 --- a/examples/simple-extension-server/go.mod +++ b/examples/simple-extension-server/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway-simple-extension-server -go 1.24.8 +go 1.25.3 require ( github.com/envoyproxy/gateway v1.5.3 diff --git a/examples/static-file-server/Dockerfile b/examples/static-file-server/Dockerfile index 0fb67e2101..f5d9c22d2c 100644 --- a/examples/static-file-server/Dockerfile +++ b/examples/static-file-server/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.8 AS builder +FROM golang:1.25.3 AS builder ARG GO_LDFLAGS="" diff --git a/examples/static-file-server/go.mod b/examples/static-file-server/go.mod index d8de508542..c9dabfb144 100644 --- a/examples/static-file-server/go.mod +++ b/examples/static-file-server/go.mod @@ -1,3 +1,3 @@ module github.com/envoyproxy/static-file-server -go 1.24.8 +go 1.25.3 diff --git a/go.mod b/go.mod index 0bf65e9fe3..ec9d47a08c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway -go 1.24.8 +go 1.25.3 require ( fortio.org/fortio v1.73.0 diff --git a/site/go.mod b/site/go.mod index 6f33df425e..7f0e2f8059 100644 --- a/site/go.mod +++ b/site/go.mod @@ -1,6 +1,6 @@ module github.com/google/docsy-example -go 1.24.8 +go 1.25.3 require ( github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3 // indirect diff --git a/tools/go.mod b/tools/go.mod index d3aaa3d49a..60a0f2a1cc 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module tools -go 1.24.8 +go 1.25.3 tool ( github.com/bufbuild/buf/cmd/buf diff --git a/tools/hack/bump-golang.sh b/tools/hack/bump-golang.sh index 09a5c626e2..492db1d2f6 100755 --- a/tools/hack/bump-golang.sh +++ b/tools/hack/bump-golang.sh @@ -2,17 +2,16 @@ # shellcheck disable=SC2038 -FROM_GOLANG_VERSION=${1:-"1.23.6"} -TO_GOLANG_VERSION=${2:-"1.24.0"} +TO_GOLANG_VERSION=${1:-"1.25.3"} echo "Bumping golang version from $FROM_GOLANG_VERSION to $TO_GOLANG_VERSION" # detect gnu-sed or sed GNU_SED=$(sed --version >/dev/null 2>&1 && echo "yes" || echo "no") if [ "$GNU_SED" == "yes" ]; then - find . -type f -name "Dockerfile" | xargs sed -i'' "s/FROM golang:$FROM_GOLANG_VERSION AS builder/FROM golang:$TO_GOLANG_VERSION AS builder/g" - find . -type f -name "go.mod" | xargs sed -i'' "s/go $FROM_GOLANG_VERSION/go $TO_GOLANG_VERSION/g" + find . -type f -name "Dockerfile" | xargs sed -i'' "s/^FROM golang:.*\$/FROM golang:$TO_GOLANG_VERSION AS builder/g" + find . -type f -name "go.mod" | xargs sed -i'' "s/^go.*\$/go $TO_GOLANG_VERSION/g" else - find . -type f -name "Dockerfile" | xargs sed -i '' "s/FROM golang:$FROM_GOLANG_VERSION AS builder/FROM golang:$TO_GOLANG_VERSION AS builder/g" - find . -type f -name "go.mod" | xargs sed -i '' "s/go $FROM_GOLANG_VERSION/go $TO_GOLANG_VERSION/g" + find . -type f -name "Dockerfile" | xargs sed -i '' "s/^FROM golang:.*\$/FROM golang:$TO_GOLANG_VERSION AS builder/g" + find . -type f -name "go.mod" | xargs sed -i '' "s/^go.*\$/go $TO_GOLANG_VERSION/g" fi