From d1354c6c6faa0f35d543286820b8ab1c269d3784 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Wed, 5 Mar 2025 10:17:28 +0100 Subject: [PATCH] [release-11.4.3] Chore: Bump Go to 1.23.7 (#101582) Chore: Bump Go to 1.23.7 --- .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 +- 21 files changed, 128 insertions(+), 128 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9794ea9ac6e..4fc5ce893a8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-alpine name: test-backend-integration trigger: event: @@ -510,7 +510,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: validate-openapi-spec trigger: event: @@ -638,7 +638,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-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.23.5 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.7 --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 @@ -1103,7 +1103,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1117,7 +1117,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1126,14 +1126,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1154,7 +1154,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1175,7 +1175,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1196,7 +1196,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1212,7 +1212,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1228,7 +1228,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1245,7 +1245,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1330,7 +1330,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue trigger: event: @@ -1450,7 +1450,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: swagger-gen trigger: event: @@ -1565,7 +1565,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1576,7 +1576,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1586,14 +1586,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - apk add --update build-base @@ -1601,7 +1601,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1613,7 +1613,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1624,7 +1624,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1635,7 +1635,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1710,7 +1710,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue trigger: branch: main @@ -1883,7 +1883,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1892,21 +1892,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-alpine name: test-backend - commands: - apk add --update build-base @@ -1915,7 +1915,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: test-backend-integration trigger: branch: main @@ -1960,22 +1960,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -2106,7 +2106,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2116,7 +2116,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2125,7 +2125,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -2162,7 +2162,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.23.5 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.7 --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 @@ -2648,7 +2648,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2662,7 +2662,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2671,14 +2671,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2699,7 +2699,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2720,7 +2720,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2741,7 +2741,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2757,7 +2757,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2773,7 +2773,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2790,7 +2790,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -3052,7 +3052,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3061,21 +3061,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-alpine name: test-backend - commands: - apk add --update build-base @@ -3084,7 +3084,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: test-backend-integration trigger: branch: @@ -3127,22 +3127,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: validate-openapi-spec trigger: branch: @@ -3232,7 +3232,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3246,7 +3246,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3255,14 +3255,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3283,7 +3283,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3304,7 +3304,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3325,7 +3325,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3341,7 +3341,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3357,7 +3357,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3374,7 +3374,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3477,7 +3477,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3609,7 +3609,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3750,7 +3750,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3841,7 +3841,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3941,7 +3941,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4038,7 +4038,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -4100,7 +4100,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.5 + GO_VERSION: 1.23.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4175,7 +4175,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.5 + GO_VERSION: 1.23.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4292,7 +4292,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.5 + GO_VERSION: 1.23.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4443,7 +4443,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4452,21 +4452,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-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.23.5-alpine + image: golang:1.23.7-alpine name: test-backend - commands: - apk add --update build-base @@ -4475,7 +4475,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: test-backend-integration trigger: cron: @@ -4529,7 +4529,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.5 + GO_VERSION: 1.23.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4673,7 +4673,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.5 + GO_VERSION: 1.23.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4779,7 +4779,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.23.5 + - --go-version=1.23.7 depends_on: - github-app-generate-token environment: @@ -4800,7 +4800,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.5 + GO_VERSION: 1.23.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4945,7 +4945,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4954,14 +4954,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4982,7 +4982,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -5003,7 +5003,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -5024,7 +5024,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -5040,7 +5040,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5056,7 +5056,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -5073,7 +5073,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.23.5-alpine + image: golang:1.23.7-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5379,7 +5379,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.23.5-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.7-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 @@ -5418,7 +5418,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.23.5-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.7-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 @@ -5688,6 +5688,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 35995c9587da10769434071607634cb589d5a3acc3e1f36f76999fc9576e264c +hmac: d05b7c957a694f6ba6b621ebaa0e7db80db3aece58130edd18483cf3902e2e21 ... diff --git a/Dockerfile b/Dockerfile index 251d0d01bf7..ec78ae26ecb 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.23.5-alpine +ARG GO_IMAGE=golang:1.23.7-alpine # Default to building locally ARG GO_SRC=go-builder diff --git a/Makefile b/Makefile index 1e4d78ce377..157296bb479 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.23.5 +GO_VERSION = 1.23.7 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 e9199b977a3..467770b4ff9 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.23.1 +go 1.23.7 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 ae4f6524653..f7409f3b852 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.22.4 +go 1.23.7 require ( github.com/prometheus/client_golang v1.20.2 diff --git a/go.mod b/go.mod index a4cf5488127..1b1ed49ffc0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.23.5 +go 1.23.7 // 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 cb58e4aa855..8ec3a7e21e7 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23.5 +go 1.23.7 // 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 dc490632e94..08845af4ebf 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.23.1 +go 1.23.7 require k8s.io/code-generator v0.31.1 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index 79d73f4e1ed..acb7ea241e9 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.23.1 +go 1.23.7 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 5de0a71f214..d34d438118d 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.23.1 +go 1.23.7 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 6e476137764..6ff139e9e59 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.23.1 +go 1.23.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 9ea30e73ea9..699836572b7 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.23.1 +go 1.23.7 // 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 3d5f56e67e4..3891ff2a55e 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.23.1 +go 1.23.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index e5417b8af56..f5dc1e70875 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.23.1 +go 1.23.7 require ( github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index cacc8f096dd..6e4f1126a25 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.23.1 +go 1.23.7 require go.opentelemetry.io/otel v1.30.0 diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index 2545bd15191..8abb9485dd2 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.23.1 +go 1.23.7 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 9e16453cf83..56c183cd30f 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.23.1 +go 1.23.7 require ( github.com/fullstorydev/grpchan v1.1.1 diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 45b2e78666a..ed860007f22 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.21.10 +go 1.23.7 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 86dadef8e4c..150a4b1e3d6 100644 --- a/scripts/build/ci-windows-test/Dockerfile +++ b/scripts/build/ci-windows-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.3-windowsservercore-1809 +FROM golang:1.23.7-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index a57d122c056..5cf086a79b9 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.23.5" +golang_version = "1.23.7" # 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 3dd4675a42d..c8134977d9f 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.23.1 +go 1.23.7 require golang.org/x/mod v0.20.0