root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 142 Packages Projects Releases Wiki Activity

Dependencies: Bump Go to v1.24.5 

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 52f6104230)
- 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.
This commit is contained in:
jev forsberg 2025-07-23 10:39:46 -06:00
parent b6513f5273
commit 3574f03e54
No known key found for this signature in database
31 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.citools/bra/go.mod
View File

@ -1,6 +1,6 @@
module bra module bra
go 1.24.4 go 1.24.5
tool github.com/unknwon/bra tool github.com/unknwon/bra

2
.citools/cog/go.mod
View File

@ -1,6 +1,6 @@
module cog module cog
go 1.24.4 go 1.24.5
tool github.com/grafana/cog/cmd/cli tool github.com/grafana/cog/cmd/cli

2
.citools/cue/go.mod
View File

@ -1,6 +1,6 @@
module cue module cue
go 1.24.4 go 1.24.5
tool cuelang.org/go/cmd/cue tool cuelang.org/go/cmd/cue

2
.citools/golangci-lint/go.mod
View File

@ -1,6 +1,6 @@
module golangci-lint module golangci-lint
go 1.24.4 go 1.24.5
tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint

2
.citools/jb/go.mod
View File

@ -1,6 +1,6 @@
module jb module jb
go 1.24.4 go 1.24.5
tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb

2
.citools/lefthook/go.mod
View File

@ -1,6 +1,6 @@
module lefthook module lefthook
go 1.24.4 go 1.24.5
tool github.com/evilmartians/lefthook tool github.com/evilmartians/lefthook

2
.citools/swagger/go.mod
View File

@ -1,6 +1,6 @@
module swagger module swagger
go 1.24.4 go 1.24.5
tool github.com/go-swagger/go-swagger/cmd/swagger tool github.com/go-swagger/go-swagger/cmd/swagger

2
Dockerfile
View File

@ -6,7 +6,7 @@
ARG BASE_IMAGE=alpine:3.21 ARG BASE_IMAGE=alpine:3.21
ARG JS_IMAGE=node:22-alpine ARG JS_IMAGE=node:22-alpine
ARG JS_PLATFORM=linux/amd64 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 # Default to building locally
ARG GO_SRC=go-builder ARG GO_SRC=go-builder

2
Makefile
View File

@ -8,7 +8,7 @@ WIRE_TAGS = "oss"
include .bingo/Variables.mk include .bingo/Variables.mk
GO = go GO = go
GO_VERSION = 1.24.4 GO_VERSION = 1.24.5
GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh)
GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh)
SH_FILES ?= $(shell find ./scripts -name *.sh) SH_FILES ?= $(shell find ./scripts -name *.sh)

2
apps/advisor/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/advisor module github.com/grafana/grafana/apps/advisor
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/grafana-app-sdk v0.31.0 github.com/grafana/grafana-app-sdk v0.31.0

2
apps/alerting/notifications/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/alerting/notifications module github.com/grafana/grafana/apps/alerting/notifications
go 1.24.4 go 1.24.5
replace github.com/grafana/grafana => ../../.. replace github.com/grafana/grafana => ../../..

2
apps/dashboard/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/dashboard module github.com/grafana/grafana/apps/dashboard
go 1.24.4 go 1.24.5
require ( require (
cuelang.org/go v0.11.1 cuelang.org/go v0.11.1

2
apps/folder/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/folder module github.com/grafana/grafana/apps/folder
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/grafana-app-sdk v0.35.1 github.com/grafana/grafana-app-sdk v0.35.1

2
apps/investigations/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/investigations module github.com/grafana/grafana/apps/investigations
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/grafana-app-sdk v0.35.1 github.com/grafana/grafana-app-sdk v0.35.1

2
apps/playlist/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/playlist module github.com/grafana/grafana/apps/playlist
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/grafana-app-sdk v0.35.1 github.com/grafana/grafana-app-sdk v0.35.1

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana module github.com/grafana/grafana
go 1.24.4 go 1.24.5
require ( require (
buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling

2
go.work
View File

@ -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 `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. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration.

2
pkg/aggregator/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/aggregator module github.com/grafana/grafana/pkg/aggregator
go 1.24.4 go 1.24.5
require ( require (
github.com/emicklei/go-restful/v3 v3.11.0 github.com/emicklei/go-restful/v3 v3.11.0

2
pkg/apimachinery/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apimachinery module github.com/grafana/grafana/pkg/apimachinery
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/authlib v0.0.0-20250325095148-d6da9c164a7d // @grafana/identity-access-team github.com/grafana/authlib v0.0.0-20250325095148-d6da9c164a7d // @grafana/identity-access-team

2
pkg/apis/secret/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apis/secret module github.com/grafana/grafana/pkg/apis/secret
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979

2
pkg/apiserver/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apiserver module github.com/grafana/grafana/pkg/apiserver
go 1.24.4 go 1.24.5
require ( require (
github.com/google/go-cmp v0.7.0 github.com/google/go-cmp v0.7.0

2
pkg/build/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build module github.com/grafana/grafana/pkg/build
go 1.24.4 go 1.24.5
// Override docker/docker to avoid: // Override docker/docker to avoid:
// go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires

2
pkg/build/wire/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build/wire module github.com/grafana/grafana/pkg/build/wire
go 1.24.4 go 1.24.5
require ( require (
github.com/google/go-cmp v0.7.0 github.com/google/go-cmp v0.7.0

2
pkg/codegen/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/codegen module github.com/grafana/grafana/pkg/codegen
go 1.24.4 go 1.24.5
require ( require (
cuelang.org/go v0.11.1 cuelang.org/go v0.11.1

2
pkg/plugins/codegen/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/plugins/codegen module github.com/grafana/grafana/pkg/plugins/codegen
go 1.24.4 go 1.24.5
replace github.com/grafana/grafana/pkg/codegen => ../../codegen replace github.com/grafana/grafana/pkg/codegen => ../../codegen

2
pkg/promlib/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/promlib module github.com/grafana/grafana/pkg/promlib
go 1.24.4 go 1.24.5
require ( require (
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040

2
pkg/semconv/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/semconv module github.com/grafana/grafana/pkg/semconv
go 1.24.4 go 1.24.5
require go.opentelemetry.io/otel v1.36.0 require go.opentelemetry.io/otel v1.36.0

2
pkg/storage/unified/apistore/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/storage/unified/apistore module github.com/grafana/grafana/pkg/storage/unified/apistore
go 1.24.4 go 1.24.5
replace ( replace (
github.com/grafana/grafana => ../../../.. github.com/grafana/grafana => ../../../..

2
pkg/storage/unified/resource/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/storage/unified/resource module github.com/grafana/grafana/pkg/storage/unified/resource
go 1.24.4 go 1.24.5
replace ( replace (
github.com/grafana/grafana/apps/folder => ../../../../apps/folder github.com/grafana/grafana/apps/folder => ../../../../apps/folder

2
pkg/util/xorm/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/util/xorm module github.com/grafana/grafana/pkg/util/xorm
go 1.24.4 go 1.24.5
require ( require (
cloud.google.com/go/spanner v1.76.1 cloud.google.com/go/spanner v1.76.1

2
scripts/drone/variables.star
View File

@ -3,7 +3,7 @@ global variables
""" """
grabpl_version = "v3.1.2" 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 should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "22.16.0" nodejs_version = "22.16.0"