mirror of https://github.com/grafana/grafana.git
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
parent
b6513f5273
commit
3574f03e54
|
|
@ -1,6 +1,6 @@
|
|||
module bra
|
||||
|
||||
go 1.24.4
|
||||
go 1.24.5
|
||||
|
||||
tool github.com/unknwon/bra
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module cog
|
||||
|
||||
go 1.24.4
|
||||
go 1.24.5
|
||||
|
||||
tool github.com/grafana/cog/cmd/cli
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module cue
|
||||
|
||||
go 1.24.4
|
||||
go 1.24.5
|
||||
|
||||
tool cuelang.org/go/cmd/cue
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module jb
|
||||
|
||||
go 1.24.4
|
||||
go 1.24.5
|
||||
|
||||
tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module lefthook
|
||||
|
||||
go 1.24.4
|
||||
go 1.24.5
|
||||
|
||||
tool github.com/evilmartians/lefthook
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module swagger
|
||||
|
||||
go 1.24.4
|
||||
go 1.24.5
|
||||
|
||||
tool github.com/go-swagger/go-swagger/cmd/swagger
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
2
Makefile
2
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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 => ../../..
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
2
go.mod
2
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
|
||||
|
|
|
|||
2
go.work
2
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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 => ../../../..
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue