From 31dcc256091d728217ae55726c4bd47b9f6ab08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20=C3=96z=C3=A7elik?= Date: Wed, 15 Jul 2026 14:28:59 -0700 Subject: [PATCH] chore: bump go directive to 1.26.5 to match the toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The go directive lagged at 1.25.5 while the toolchain was pinned to go1.26.5, which was needlessly confusing. Set a single `go 1.26.5` directive and drop the now-redundant toolchain line, giving one source of truth for the language/toolchain version. CI reads go-version-file: go.mod, so it picks up 1.26.5 automatically. The Docker builder images, however, pin the Go version themselves and ship with GOTOOLCHAIN=local, so golang:1.25.5 refused the new directive (`go mod download` failed in the image-build workflow). Bump all five builder images to golang:1.26.5 to match. Build, test, and audit all pass. Spec: TBD Signed-off-by: Volkan Özçelik --- dockerfiles/bootstrap.Dockerfile | 2 +- dockerfiles/demo.Dockerfile | 2 +- dockerfiles/keeper.Dockerfile | 2 +- dockerfiles/nexus.Dockerfile | 2 +- dockerfiles/pilot.Dockerfile | 2 +- go.mod | 4 +--- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dockerfiles/bootstrap.Dockerfile b/dockerfiles/bootstrap.Dockerfile index 965c3761..4b0550ae 100644 --- a/dockerfiles/bootstrap.Dockerfile +++ b/dockerfiles/bootstrap.Dockerfile @@ -2,7 +2,7 @@ # \\\\\ Copyright 2024-present SPIKE contributors. # \\\\\\\ SPDX-License-Identifier: Apache-2.0 -FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/dockerfiles/demo.Dockerfile b/dockerfiles/demo.Dockerfile index 8f08f407..ead8b8a2 100644 --- a/dockerfiles/demo.Dockerfile +++ b/dockerfiles/demo.Dockerfile @@ -2,7 +2,7 @@ # \\\\\ Copyright 2024-present SPIKE contributors. # \\\\\\\ SPDX-License-Identifier: Apache-2.0 -FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/dockerfiles/keeper.Dockerfile b/dockerfiles/keeper.Dockerfile index 2e9dea59..c2d486ed 100644 --- a/dockerfiles/keeper.Dockerfile +++ b/dockerfiles/keeper.Dockerfile @@ -2,7 +2,7 @@ # \\\\\ Copyright 2024-present SPIKE contributors. # \\\\\\\ SPDX-License-Identifier: Apache-2.0 -FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/dockerfiles/nexus.Dockerfile b/dockerfiles/nexus.Dockerfile index bef172b3..94a2a3e1 100644 --- a/dockerfiles/nexus.Dockerfile +++ b/dockerfiles/nexus.Dockerfile @@ -2,7 +2,7 @@ # \\\\\ Copyright 2024-present SPIKE contributors. # \\\\\\\ SPDX-License-Identifier: Apache-2.0 -FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/dockerfiles/pilot.Dockerfile b/dockerfiles/pilot.Dockerfile index 58b30148..4f3928bd 100644 --- a/dockerfiles/pilot.Dockerfile +++ b/dockerfiles/pilot.Dockerfile @@ -2,7 +2,7 @@ # \\\\\ Copyright 2024-present SPIKE contributors. # \\\\\\\ SPDX-License-Identifier: Apache-2.0 -FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder +FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/go.mod b/go.mod index 92cfceba..a74433d7 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/spiffe/spike -go 1.25.5 - -toolchain go1.26.5 +go 1.26.5 require ( github.com/cloudflare/circl v1.6.3