Go: Update to 1.24.6 (#109313)

Co-authored-by: joshhunt <josh.hunt@grafana.com>
This commit is contained in:
Mariell Hoversholm 2025-08-07 10:27:01 +02:00 committed by GitHub
parent 16f8359d35
commit 28024c74f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 58 additions and 53 deletions

View File

@ -50,7 +50,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
branch: main branch: main
@ -117,7 +117,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -127,7 +127,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -136,7 +136,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -186,7 +186,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: rgm-package name: rgm-package
pull: always pull: always
volumes: volumes:
@ -664,7 +664,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts docker fetch --edition oss - ./bin/build artifacts docker fetch --edition oss
@ -794,7 +794,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts docker fetch --edition oss - ./bin/build artifacts docker fetch --edition oss
@ -935,7 +935,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket
@ -1027,7 +1027,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1127,7 +1127,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- depends_on: - depends_on:
- compile-build-cmd - compile-build-cmd
@ -1224,7 +1224,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build publish grafana-com --edition oss ${DRONE_TAG} - ./bin/build publish grafana-com --edition oss ${DRONE_TAG}
@ -1298,7 +1298,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -1375,7 +1375,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -1494,7 +1494,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -1619,7 +1619,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.5-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -1873,3 +1873,8 @@ get:
path: secret/data/common/gcr path: secret/data/common/gcr
kind: secret kind: secret
name: gcr_credentials name: gcr_credentials
---
kind: signature
hmac: 70171a24c7e9ab7af105bd39d02f9aa6d28a4505963dfc9140f53cdfe4965ef8
...

View File

@ -16,7 +16,7 @@ ARG JS_SRC=js-builder
# By using FROM instructions we can delegate dependency updates to dependabot # By using FROM instructions we can delegate dependency updates to dependabot
FROM alpine:3.21.3 AS alpine-base FROM alpine:3.21.3 AS alpine-base
FROM ubuntu:22.04 AS ubuntu-base FROM ubuntu:22.04 AS ubuntu-base
FROM golang:1.24.5-alpine AS go-builder-base FROM golang:1.24.6-alpine AS go-builder-base
FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base
# Javascript build stage # Javascript build stage

View File

@ -9,7 +9,7 @@ include .bingo/Variables.mk
include .citools/Variables.mk include .citools/Variables.mk
GO = go GO = go
GO_VERSION = 1.24.5 GO_VERSION = 1.24.6
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)

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/advisor module github.com/grafana/grafana/apps/advisor
go 1.24.5 go 1.24.6
require ( require (
github.com/Masterminds/semver/v3 v3.4.0 github.com/Masterminds/semver/v3 v3.4.0

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.5 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.40.3 github.com/grafana/grafana-app-sdk v0.40.3

View File

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

View File

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

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/iam module github.com/grafana/grafana/apps/iam
go 1.24.5 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.40.3 github.com/grafana/grafana-app-sdk v0.40.3

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/investigations module github.com/grafana/grafana/apps/investigations
go 1.24.5 go 1.24.6
require ( require (
github.com/grafana/grafana v0.0.0-00010101000000-000000000000 github.com/grafana/grafana v0.0.0-00010101000000-000000000000

View File

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

View File

@ -1,3 +1,3 @@
module github.com/grafana/grafana/apps/preferences module github.com/grafana/grafana/apps/preferences
go 1.24.5 go 1.24.6

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/provisioning module github.com/grafana/grafana/apps/provisioning
go 1.24.5 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.40.3 github.com/grafana/grafana-app-sdk v0.40.3

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/secret module github.com/grafana/grafana/apps/secret
go 1.24.5 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.40.3 github.com/grafana/grafana-app-sdk v0.40.3

View File

@ -2,7 +2,7 @@ module github.com/grafana/grafana/apps/shorturl
go 1.24.0 go 1.24.0
toolchain go1.24.5 toolchain go1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.40.3 github.com/grafana/grafana-app-sdk v0.40.3

View File

@ -1,6 +1,6 @@
module high-card module high-card
go 1.24.5 go 1.24.6
require github.com/prometheus/client_golang v1.22.0 require github.com/prometheus/client_golang v1.22.0

View File

@ -1,6 +1,6 @@
module utf8-support module utf8-support
go 1.24.5 go 1.24.6
require ( require (
github.com/prometheus/client_golang v1.22.0 github.com/prometheus/client_golang v1.22.0

View File

@ -1,4 +1,4 @@
FROM golang:1.24.5 FROM golang:1.24.6
ADD main.go /go/src/webhook/main.go ADD main.go /go/src/webhook/main.go

View File

@ -171,7 +171,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.24.5 go-version: 1.24.6
- name: Verify Go version - name: Verify Go version
run: go version run: go version
@ -212,7 +212,7 @@ This GitHub Action automates the deployment of a Grafana dashboard using the Fou
The first few steps: The first few steps:
- Check out the repository to access the project code. - Check out the repository to access the project code.
- Install Go 1.24.5 using the `actions/setup-go` action. - Install Go 1.24.6 using the `actions/setup-go` action.
- Verify Go is properly installed. - Verify Go is properly installed.
### 2. Download and install `grafanactl` ### 2. Download and install `grafanactl`

View File

@ -17,7 +17,7 @@ test.describe(
tag: ['@dashboards'], tag: ['@dashboards'],
}, },
() => { () => {
test('Tests dashboard time zone scenarios', async ({ page, gotoDashboardPage, selectors }) => { test.fixme('Tests dashboard time zone scenarios', async ({ page, gotoDashboardPage, selectors }) => {
const dashboardPage = await gotoDashboardPage({ uid: TIMEZONE_DASHBOARD_UID }); const dashboardPage = await gotoDashboardPage({ uid: TIMEZONE_DASHBOARD_UID });
const fromTimeZone = 'UTC'; const fromTimeZone = 'UTC';

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana module github.com/grafana/grafana
go 1.24.5 go 1.24.6
require ( require (
buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling

View File

@ -1,4 +1,4 @@
go 1.24.5 go 1.24.6
// 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.

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/hack module github.com/grafana/grafana/hack
go 1.24.5 go 1.24.6
require k8s.io/code-generator v0.33.1 require k8s.io/code-generator v0.33.1

View File

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

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apimachinery module github.com/grafana/grafana/pkg/apimachinery
go 1.24.5 go 1.24.6
require ( require (
github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team

View File

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

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build module github.com/grafana/grafana/pkg/build
go 1.24.5 go 1.24.6
// 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

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.5 go 1.24.6
require ( require (
github.com/google/go-cmp v0.7.0 github.com/google/go-cmp v0.7.0

View File

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

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.5 go 1.24.6
replace github.com/grafana/grafana/pkg/codegen => ../../codegen replace github.com/grafana/grafana/pkg/codegen => ../../codegen

View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/promlib module github.com/grafana/grafana/pkg/promlib
go 1.24.5 go 1.24.6
require ( require (
github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914 github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914

View File

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

View File

@ -3,7 +3,7 @@ global variables
""" """
grabpl_version = "v3.1.2" grabpl_version = "v3.1.2"
golang_version = "1.24.5" golang_version = "1.24.6"
# 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"

View File

@ -1,5 +1,5 @@
module github.com/grafana/grafana/scripts/go-workspace module github.com/grafana/grafana/scripts/go-workspace
go 1.24.5 go 1.24.6
require golang.org/x/mod v0.24.0 require golang.org/x/mod v0.24.0

View File

@ -1,5 +1,5 @@
module github.com/grafana/grafana/scripts/modowners module github.com/grafana/grafana/scripts/modowners
go 1.24.5 go 1.24.6
require golang.org/x/mod v0.24.0 require golang.org/x/mod v0.24.0