From 8eefb0dd8f36eab8d03c4e8a15de80c077e4de7a Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Thu, 8 May 2025 16:08:27 +0200 Subject: [PATCH] [release-11.4.5] Chore: Bump Go version to 1.24.3 (#105110) Chore: Bump Go version to 1.24.3 --- .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 c649e6549b6..9e5d2318f23 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.2 +go 1.24.3 require github.com/golangci/golangci-lint v1.64.2 // cmd/golangci-lint diff --git a/.drone.yml b/.drone.yml index 11dcdb0c1a3..c172a70f48e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: event: @@ -510,7 +510,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec trigger: event: @@ -638,7 +638,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-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.2 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.3 --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 @@ -1101,7 +1101,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1115,7 +1115,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1124,14 +1124,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1152,7 +1152,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1173,7 +1173,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1194,7 +1194,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1210,7 +1210,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1226,7 +1226,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1243,7 +1243,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1328,7 +1328,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue trigger: event: @@ -1448,7 +1448,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: swagger-gen trigger: event: @@ -1563,7 +1563,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1574,7 +1574,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1584,14 +1584,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base @@ -1599,7 +1599,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1611,7 +1611,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1622,7 +1622,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1633,7 +1633,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1708,7 +1708,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue trigger: branch: main @@ -1881,7 +1881,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1890,21 +1890,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -1913,7 +1913,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: branch: main @@ -1958,22 +1958,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -2104,7 +2104,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2114,7 +2114,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2123,7 +2123,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -2160,7 +2160,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.2 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.3 --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 @@ -2642,7 +2642,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2656,7 +2656,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2665,14 +2665,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2693,7 +2693,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2714,7 +2714,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2735,7 +2735,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2751,7 +2751,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2767,7 +2767,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2784,7 +2784,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -3046,7 +3046,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3055,21 +3055,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -3078,7 +3078,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: branch: @@ -3121,22 +3121,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec trigger: branch: @@ -3226,7 +3226,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3240,7 +3240,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3249,14 +3249,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3277,7 +3277,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3298,7 +3298,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3319,7 +3319,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3335,7 +3335,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3351,7 +3351,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3368,7 +3368,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3471,7 +3471,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3601,7 +3601,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3742,7 +3742,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3833,7 +3833,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3933,7 +3933,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4030,7 +4030,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -4092,7 +4092,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4167,7 +4167,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4284,7 +4284,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4435,7 +4435,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4444,21 +4444,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-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.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -4467,7 +4467,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: cron: @@ -4521,7 +4521,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4665,7 +4665,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4771,7 +4771,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.2 + - --go-version=1.24.3 depends_on: - github-app-generate-token environment: @@ -4792,7 +4792,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4937,7 +4937,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4946,14 +4946,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4974,7 +4974,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4995,7 +4995,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -5016,7 +5016,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -5032,7 +5032,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5048,7 +5048,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -5065,7 +5065,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5371,7 +5371,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.2-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.3-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 @@ -5410,7 +5410,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.2-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.3-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 @@ -5668,6 +5668,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 78ac28b59a6da5289b69c043c12032c3820755dc0d6f1757ec77f0d1eff29650 +hmac: 3575a2899316cbc94d9a26960841ccd6efba6464b4e847d2a1c4e357a37ab8cb ... diff --git a/Dockerfile b/Dockerfile index 0aed01c6b0b..0098155411f 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.2-alpine +ARG GO_IMAGE=golang:1.24.3-alpine # Default to building locally ARG GO_SRC=go-builder diff --git a/Makefile b/Makefile index 18c861930f8..4c9b2c71d02 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.24.2 +GO_VERSION = 1.24.3 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 eeb67f24b7d..55356c02f61 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.2 +go 1.24.3 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 04d8453961c..e3c118bfc34 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.2 +go 1.24.3 require ( github.com/prometheus/client_golang v1.20.2 diff --git a/go.mod b/go.mod index 2e4aeed0886..6fa2916bec4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.2 +go 1.24.3 // 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 46d99948f6f..aa0de954093 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.2 +go 1.24.3 // 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 ce2016ea009..5a9d27106a3 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.24.2 +go 1.24.3 require k8s.io/code-generator v0.31.1 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index a19cefd859f..7fde4de9486 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.2 +go 1.24.3 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 16f5a93546c..0fffb64a07a 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.2 +go 1.24.3 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 8748ecbfbf2..03652bd270a 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.2 +go 1.24.3 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index d3a2d77be6d..829895ebb6f 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.2 +go 1.24.3 // 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 c4837bab562..c117dc3e596 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.2 +go 1.24.3 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 8ae29bfe537..17562bed19d 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.2 +go 1.24.3 require ( github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index cec583fccc4..a17b4c5707c 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.2 +go 1.24.3 require go.opentelemetry.io/otel v1.34.0 diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index 388af381215..6802a5e915a 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.2 +go 1.24.3 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 5a5eef78bdb..891d7884473 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.2 +go 1.24.3 require ( github.com/fullstorydev/grpchan v1.1.1 diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 55256669007..c0c03e62929 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.2 +go 1.24.3 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 f5573d1cb9f..41d18ffc62c 100644 --- a/scripts/build/ci-windows-test/Dockerfile +++ b/scripts/build/ci-windows-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.2-windowsservercore-1809 +FROM golang:1.24.3-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 54b76ba1804..511223cc91e 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.2" +golang_version = "1.24.3" # 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 0fecdb95ce7..3f63f74e724 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.2 +go 1.24.3 require golang.org/x/mod v0.20.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index e0963d9a06a..b6401606139 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.2 +go 1.24.3 require golang.org/x/mod v0.17.0