From 2fdda12414af24cdc71bae44e125d210ee9a34e9 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Wed, 11 Jun 2025 18:05:45 +0200 Subject: [PATCH] [release-11.4.6] Dependencies: Bump Go to v1.24.4 (#106569) Dependencies: Bump Go to v1.24.4 --- .bingo/golangci-lint.mod | 2 +- .drone.yml | 216 +++++++++--------- Dockerfile | 2 +- Makefile | 2 +- apps/playlist/go.mod | 2 +- .../docker/blocks/prometheus_high_card/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- hack/go.mod | 2 +- pkg/aggregator/go.mod | 2 +- pkg/apimachinery/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/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/build/ci-windows-test/Dockerfile | 2 +- scripts/drone/variables.star | 2 +- scripts/go-workspace/go.mod | 2 +- scripts/modowners/go.mod | 2 +- 23 files changed, 130 insertions(+), 130 deletions(-) diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index 9e5d2318f23..cbdcde942a3 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.24.3 +go 1.24.4 require github.com/golangci/golangci-lint v1.64.2 // cmd/golangci-lint diff --git a/.drone.yml b/.drone.yml index 7f1a8a30671..68805640238 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -75,7 +75,7 @@ steps: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: lint-starlark trigger: event: @@ -424,7 +424,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -433,21 +433,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend - commands: - apk add --update build-base @@ -456,7 +456,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend-integration trigger: event: @@ -510,7 +510,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - echo $(/usr/bin/github-app-external-token) > /github-app/token @@ -554,16 +554,16 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: validate-openapi-spec trigger: event: @@ -638,7 +638,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -648,7 +648,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -657,7 +657,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -695,7 +695,7 @@ steps: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 - -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.3 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.4 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD @@ -1072,7 +1072,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1086,7 +1086,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1095,14 +1095,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1123,7 +1123,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1144,7 +1144,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1165,7 +1165,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1181,7 +1181,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1197,7 +1197,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1214,7 +1214,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1299,7 +1299,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue trigger: event: @@ -1419,7 +1419,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: swagger-gen trigger: event: @@ -1534,7 +1534,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1545,7 +1545,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1555,14 +1555,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - apk add --update build-base @@ -1570,7 +1570,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1582,7 +1582,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1593,7 +1593,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1604,7 +1604,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1679,7 +1679,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue trigger: branch: main @@ -1852,7 +1852,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1861,21 +1861,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend - commands: - apk add --update build-base @@ -1884,7 +1884,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend-integration trigger: branch: main @@ -1929,22 +1929,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -2075,7 +2075,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2085,7 +2085,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2094,7 +2094,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -2131,7 +2131,7 @@ steps: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 - -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.3 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.4 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD @@ -2584,7 +2584,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2598,7 +2598,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2607,14 +2607,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2635,7 +2635,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2656,7 +2656,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2677,7 +2677,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2693,7 +2693,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2709,7 +2709,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2726,7 +2726,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2988,7 +2988,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2997,21 +2997,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend - commands: - apk add --update build-base @@ -3020,7 +3020,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend-integration trigger: branch: @@ -3063,22 +3063,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: validate-openapi-spec trigger: branch: @@ -3168,7 +3168,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3182,7 +3182,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3191,14 +3191,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3219,7 +3219,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3240,7 +3240,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3261,7 +3261,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3277,7 +3277,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3293,7 +3293,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3310,7 +3310,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3413,7 +3413,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3543,7 +3543,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3684,7 +3684,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3775,7 +3775,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3875,7 +3875,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3972,7 +3972,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -4034,7 +4034,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.3 + GO_VERSION: 1.24.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4109,7 +4109,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.3 + GO_VERSION: 1.24.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4226,7 +4226,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.3 + GO_VERSION: 1.24.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4377,7 +4377,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4386,21 +4386,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend - commands: - apk add --update build-base @@ -4409,7 +4409,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: test-backend-integration trigger: cron: @@ -4463,7 +4463,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.3 + GO_VERSION: 1.24.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4607,7 +4607,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.3 + GO_VERSION: 1.24.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4713,7 +4713,7 @@ steps: - export GITHUB_TOKEN=$(cat /github-app/token) - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF} --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} ' - - --go-version=1.24.3 + - --go-version=1.24.4 depends_on: - github-app-generate-token environment: @@ -4734,7 +4734,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.3 + GO_VERSION: 1.24.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4879,7 +4879,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4888,14 +4888,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4916,7 +4916,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4937,7 +4937,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4958,7 +4958,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4974,7 +4974,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4990,7 +4990,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -5007,7 +5007,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.3-alpine + image: golang:1.24.4-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5313,7 +5313,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.3-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.4-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -5352,7 +5352,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.3-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.4-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -5610,6 +5610,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 3024a20fefb44fc005c20afd980f2a88d5f5c4c384bd22a401174f93da25bff3 +hmac: 860a7d10789200a525ad999a1dab0f7361e28613fd646f2265efef2f8dfede3b ... diff --git a/Dockerfile b/Dockerfile index 0098155411f..323a7b399b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG BASE_IMAGE=alpine:3.21 ARG JS_IMAGE=node:20-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.24.3-alpine +ARG GO_IMAGE=golang:1.24.4-alpine # Default to building locally ARG GO_SRC=go-builder diff --git a/Makefile b/Makefile index 4c9b2c71d02..27f12a496f0 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.24.3 +GO_VERSION = 1.24.4 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/playlist/go.mod b/apps/playlist/go.mod index 97b3ebb3dd8..2a8f2a25441 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.3 +go 1.24.4 require ( github.com/grafana/grafana-app-sdk v0.19.0 diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod index 002b0dc5176..6f2814705b2 100644 --- a/devenv/docker/blocks/prometheus_high_card/go.mod +++ b/devenv/docker/blocks/prometheus_high_card/go.mod @@ -1,6 +1,6 @@ module high-card -go 1.24.3 +go 1.24.4 require ( github.com/prometheus/client_golang v1.22.0 diff --git a/go.mod b/go.mod index 26ae09e67ef..c1aedf6117d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.3 +go 1.24.4 // contains openapi encoder fixes. remove ASAP replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code diff --git a/go.work b/go.work index 0e7e544f1f0..7e35e94b53c 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.3 +go 1.24.4 // 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/hack/go.mod b/hack/go.mod index 1afc88a991e..13dee62263a 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.24.3 +go 1.24.4 require k8s.io/code-generator v0.31.1 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index f7f5fe35aad..7b0316fbb5b 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.3 +go 1.24.4 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index d6c2b411f95..e702f719409 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.3 +go 1.24.4 require ( github.com/grafana/authlib v0.0.0-20240919120951-58259833c564 // @grafana/identity-access-team diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 9a104bb7adc..e7768cdfd35 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.3 +go 1.24.4 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index e31047d1a9d..6520af5b8df 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.3 +go 1.24.4 // 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 3b1d875b3fd..f2286a2c311 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.3 +go 1.24.4 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 8e2602ef086..b3ca4f37f88 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.3 +go 1.24.4 require ( github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 40aa5ce47a3..f3a2f4b31dd 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.3 +go 1.24.4 require go.opentelemetry.io/otel v1.35.0 diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index 5916a887001..4986df9f579 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.3 +go 1.24.4 require ( github.com/grafana/authlib/claims v0.0.0-20240903121118-16441568af1e diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index 571e074b5e1..78e3d03f50c 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.3 +go 1.24.4 require ( github.com/blevesearch/bleve/v2 v2.5.0 diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 6e39752cf9f..7bbcbd7ca1c 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.3 +go 1.24.4 require ( github.com/mattn/go-sqlite3 v1.14.22 diff --git a/scripts/build/ci-windows-test/Dockerfile b/scripts/build/ci-windows-test/Dockerfile index 41d18ffc62c..fa8dddb061d 100644 --- a/scripts/build/ci-windows-test/Dockerfile +++ b/scripts/build/ci-windows-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.3-windowsservercore-1809 +FROM golang:1.24.4-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 511223cc91e..541272fdcd8 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.3" +golang_version = "1.24.4" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0" diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index bc39d670ccd..5e23c2f70b2 100644 --- a/scripts/go-workspace/go.mod +++ b/scripts/go-workspace/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/go-workspace -go 1.24.3 +go 1.24.4 require golang.org/x/mod v0.24.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index 1b2315dde57..10b70c57884 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.24.3 +go 1.24.4 require golang.org/x/mod v0.24.0