Skip to content

Commit 42547a7

Browse files
authored
chore: bump go directive to 1.26.5 to match the toolchain (#303)
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 <volkan.ozcelik@broadcom.com>
1 parent f6b8aa9 commit 42547a7

6 files changed

Lines changed: 6 additions & 8 deletions

File tree

dockerfiles/bootstrap.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# \\\\\ Copyright 2024-present SPIKE contributors.
33
# \\\\\\\ SPDX-License-Identifier: Apache-2.0
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder
66
ARG BUILDPLATFORM
77
ARG TARGETPLATFORM
88
ARG TARGETOS

dockerfiles/demo.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# \\\\\ Copyright 2024-present SPIKE contributors.
33
# \\\\\\\ SPDX-License-Identifier: Apache-2.0
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder
66
ARG BUILDPLATFORM
77
ARG TARGETPLATFORM
88
ARG TARGETOS

dockerfiles/keeper.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# \\\\\ Copyright 2024-present SPIKE contributors.
33
# \\\\\\\ SPDX-License-Identifier: Apache-2.0
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder
66
ARG BUILDPLATFORM
77
ARG TARGETPLATFORM
88
ARG TARGETOS

dockerfiles/nexus.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# \\\\\ Copyright 2024-present SPIKE contributors.
33
# \\\\\\\ SPDX-License-Identifier: Apache-2.0
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder
66
ARG BUILDPLATFORM
77
ARG TARGETPLATFORM
88
ARG TARGETOS

dockerfiles/pilot.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# \\\\\ Copyright 2024-present SPIKE contributors.
33
# \\\\\\\ SPDX-License-Identifier: Apache-2.0
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.26.5 AS builder
66
ARG BUILDPLATFORM
77
ARG TARGETPLATFORM
88
ARG TARGETOS

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/spiffe/spike
22

3-
go 1.25.5
4-
5-
toolchain go1.26.5
3+
go 1.26.5
64

75
require (
86
github.com/cloudflare/circl v1.6.3

0 commit comments

Comments
 (0)