From 3574f03e54a54f366b40e5a0ba4f3d1f81b3b354 Mon Sep 17 00:00:00 2001 From: jev forsberg Date: Wed, 23 Jul 2025 10:39:46 -0600 Subject: [PATCH] Dependencies: Bump Go to v1.24.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves enterprise build failures caused by dependency cascade requiring Go 1.24.5. Updates all workspace modules and build configuration for consistency. - Update go.work, go.mod, and 29 workspace modules from Go 1.24.4 to Go 1.24.5 - Update Dockerfile: golang:1.24.4-alpine → golang:1.24.5-alpine - Update Makefile and drone variables to Go 1.24.5 - Aligns with main branch (commit 52f6104230ee) - Prevents GOTOOLCHAIN=local build failures in CI environments - Tested: go mod tidy, workspace sync, and enterprise builds all work Fixes issue where enterprise drone builds failed with: 'go: go.work requires go >= 1.24.5 (running go 1.24.4; GOTOOLCHAIN=local)' Related to release-12.0.3 tagging requirements. --- .citools/bra/go.mod | 2 +- .citools/cog/go.mod | 2 +- .citools/cue/go.mod | 2 +- .citools/golangci-lint/go.mod | 2 +- .citools/jb/go.mod | 2 +- .citools/lefthook/go.mod | 2 +- .citools/swagger/go.mod | 2 +- Dockerfile | 2 +- Makefile | 2 +- apps/advisor/go.mod | 2 +- apps/alerting/notifications/go.mod | 2 +- apps/dashboard/go.mod | 2 +- apps/folder/go.mod | 2 +- apps/investigations/go.mod | 2 +- apps/playlist/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- pkg/aggregator/go.mod | 2 +- pkg/apimachinery/go.mod | 2 +- pkg/apis/secret/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/go.mod | 2 +- pkg/codegen/go.mod | 2 +- pkg/plugins/codegen/go.mod | 2 +- pkg/promlib/go.mod | 2 +- pkg/semconv/go.mod | 2 +- pkg/storage/unified/apistore/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- pkg/util/xorm/go.mod | 2 +- scripts/drone/variables.star | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.citools/bra/go.mod b/.citools/bra/go.mod index b37f09f62f9..fec1ff55bbb 100644 --- a/.citools/bra/go.mod +++ b/.citools/bra/go.mod @@ -1,6 +1,6 @@ module bra -go 1.24.4 +go 1.24.5 tool github.com/unknwon/bra diff --git a/.citools/cog/go.mod b/.citools/cog/go.mod index cf2657aa3ee..be63ea2817a 100644 --- a/.citools/cog/go.mod +++ b/.citools/cog/go.mod @@ -1,6 +1,6 @@ module cog -go 1.24.4 +go 1.24.5 tool github.com/grafana/cog/cmd/cli diff --git a/.citools/cue/go.mod b/.citools/cue/go.mod index f63c57d9c89..01b88423147 100644 --- a/.citools/cue/go.mod +++ b/.citools/cue/go.mod @@ -1,6 +1,6 @@ module cue -go 1.24.4 +go 1.24.5 tool cuelang.org/go/cmd/cue diff --git a/.citools/golangci-lint/go.mod b/.citools/golangci-lint/go.mod index 8e81ddfb588..642f89792bc 100644 --- a/.citools/golangci-lint/go.mod +++ b/.citools/golangci-lint/go.mod @@ -1,6 +1,6 @@ module golangci-lint -go 1.24.4 +go 1.24.5 tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint diff --git a/.citools/jb/go.mod b/.citools/jb/go.mod index eec18890a50..05208bc103e 100644 --- a/.citools/jb/go.mod +++ b/.citools/jb/go.mod @@ -1,6 +1,6 @@ module jb -go 1.24.4 +go 1.24.5 tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb diff --git a/.citools/lefthook/go.mod b/.citools/lefthook/go.mod index f33621cf3ad..abd6c7b5229 100644 --- a/.citools/lefthook/go.mod +++ b/.citools/lefthook/go.mod @@ -1,6 +1,6 @@ module lefthook -go 1.24.4 +go 1.24.5 tool github.com/evilmartians/lefthook diff --git a/.citools/swagger/go.mod b/.citools/swagger/go.mod index 1d0668c0e3b..a36d20ae23b 100644 --- a/.citools/swagger/go.mod +++ b/.citools/swagger/go.mod @@ -1,6 +1,6 @@ module swagger -go 1.24.4 +go 1.24.5 tool github.com/go-swagger/go-swagger/cmd/swagger diff --git a/Dockerfile b/Dockerfile index efd5a79f83c..7d2a6793d02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG BASE_IMAGE=alpine:3.21 ARG JS_IMAGE=node:22-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.24.4-alpine +ARG GO_IMAGE=golang:1.24.5-alpine # Default to building locally ARG GO_SRC=go-builder diff --git a/Makefile b/Makefile index d8a00a8ff39..a45ba4af9b8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.24.4 +GO_VERSION = 1.24.5 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) SH_FILES ?= $(shell find ./scripts -name *.sh) diff --git a/apps/advisor/go.mod b/apps/advisor/go.mod index bc301e3fedd..cf851395de9 100644 --- a/apps/advisor/go.mod +++ b/apps/advisor/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/advisor -go 1.24.4 +go 1.24.5 require ( github.com/grafana/grafana-app-sdk v0.31.0 diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index 0f85be4dc8e..90c8e2efbf8 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.24.4 +go 1.24.5 replace github.com/grafana/grafana => ../../.. diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod index da238878563..6eaee0ccffc 100644 --- a/apps/dashboard/go.mod +++ b/apps/dashboard/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/dashboard -go 1.24.4 +go 1.24.5 require ( cuelang.org/go v0.11.1 diff --git a/apps/folder/go.mod b/apps/folder/go.mod index 332918691d9..566af9094cd 100644 --- a/apps/folder/go.mod +++ b/apps/folder/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/folder -go 1.24.4 +go 1.24.5 require ( github.com/grafana/grafana-app-sdk v0.35.1 diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod index 2c3a068bc29..fae2bec8bf7 100644 --- a/apps/investigations/go.mod +++ b/apps/investigations/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/investigations -go 1.24.4 +go 1.24.5 require ( github.com/grafana/grafana-app-sdk v0.35.1 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index 6fa73a7b5df..d0322deb8aa 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.24.4 +go 1.24.5 require ( github.com/grafana/grafana-app-sdk v0.35.1 diff --git a/go.mod b/go.mod index 7144c74129e..1c793784ca6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.4 +go 1.24.5 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling diff --git a/go.work b/go.work index db33d00a93b..c1c74ea6d70 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.4 +go 1.24.5 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index 240cb01abda..08066d55390 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.24.4 +go 1.24.5 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index bcac7bdac67..213bdad04f9 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.24.4 +go 1.24.5 require ( github.com/grafana/authlib v0.0.0-20250325095148-d6da9c164a7d // @grafana/identity-access-team diff --git a/pkg/apis/secret/go.mod b/pkg/apis/secret/go.mod index ba31874bb7e..23b663bc040 100644 --- a/pkg/apis/secret/go.mod +++ b/pkg/apis/secret/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apis/secret -go 1.24.4 +go 1.24.5 require ( github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 5d624d133b3..d1761e58afa 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.24.4 +go 1.24.5 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 1daf314dc1b..86c4cc9fa60 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.24.4 +go 1.24.5 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 1c3a3bf1206..73516c0267d 100644 --- a/pkg/build/wire/go.mod +++ b/pkg/build/wire/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build/wire -go 1.24.4 +go 1.24.5 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index fc40e9c87f1..08f9464a72e 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.24.4 +go 1.24.5 require ( cuelang.org/go v0.11.1 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index 65949cb58a4..139334f5c48 100644 --- a/pkg/plugins/codegen/go.mod +++ b/pkg/plugins/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/plugins/codegen -go 1.24.4 +go 1.24.5 replace github.com/grafana/grafana/pkg/codegen => ../../codegen diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index a7f3bd3424e..c159bde3e15 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.24.4 +go 1.24.5 require ( github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 0dad3f7ee25..1e3d7616397 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.24.4 +go 1.24.5 require go.opentelemetry.io/otel v1.36.0 diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index c19e234ae6b..02a3fd1c233 100644 --- a/pkg/storage/unified/apistore/go.mod +++ b/pkg/storage/unified/apistore/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/apistore -go 1.24.4 +go 1.24.5 replace ( github.com/grafana/grafana => ../../../.. diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index 60b60845fda..e97b8a1fb05 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/resource -go 1.24.4 +go 1.24.5 replace ( github.com/grafana/grafana/apps/folder => ../../../../apps/folder diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 174b7119778..0a3ce02d4d3 100644 --- a/pkg/util/xorm/go.mod +++ b/pkg/util/xorm/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/util/xorm -go 1.24.4 +go 1.24.5 require ( cloud.google.com/go/spanner v1.76.1 diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 95dfc640eb3..c14e87833fd 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.2" -golang_version = "1.24.4" +golang_version = "1.24.5" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "22.16.0"