From 05ea05d64e269ae8a8fa7fa176caf783a78cae55 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Tue, 14 Jan 2025 09:28:44 +0100 Subject: [PATCH] Chore: Bump Go to 1.23.4 (#98853) * Chore: Bump Go to 1.23.4 This is done in preparation of updating the App SDK library we import, as it has bumped its Go version to 1.23.4 as well. * Chore: make update-workspace --- .drone.yml | 210 ++++++++++++++-------------- Makefile | 2 +- apps/alerting/notifications/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- pkg/storage/unified/apistore/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- scripts/drone/variables.star | 2 +- 8 files changed, 112 insertions(+), 112 deletions(-) diff --git a/.drone.yml b/.drone.yml index 516e31ade06..4190807e50a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.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.23.1-alpine + image: golang:1.23.4-alpine name: lint-starlark trigger: event: @@ -427,7 +427,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -436,21 +436,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.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.23.1-alpine + image: golang:1.23.4-alpine name: test-backend - commands: - apk add --update build-base @@ -459,7 +459,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: test-backend-integration trigger: event: @@ -513,7 +513,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - echo $(/usr/bin/github-app-external-token) > /github-app/token @@ -558,16 +558,16 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: validate-openapi-spec trigger: event: @@ -643,7 +643,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -653,7 +653,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -662,7 +662,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -698,7 +698,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.1 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.4 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD @@ -1096,7 +1096,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1110,7 +1110,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1119,14 +1119,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1147,7 +1147,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1168,7 +1168,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1184,7 +1184,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1200,7 +1200,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1216,7 +1216,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1303,7 +1303,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue trigger: event: @@ -1424,7 +1424,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: swagger-gen trigger: event: @@ -1529,7 +1529,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1540,7 +1540,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1550,14 +1550,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - apk add --update build-base @@ -1565,7 +1565,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1577,7 +1577,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1588,7 +1588,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1665,7 +1665,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue trigger: branch: main @@ -1838,7 +1838,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1847,21 +1847,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.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.23.1-alpine + image: golang:1.23.4-alpine name: test-backend - commands: - apk add --update build-base @@ -1870,7 +1870,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: test-backend-integration trigger: branch: main @@ -1915,22 +1915,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -2062,7 +2062,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2072,7 +2072,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2081,7 +2081,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -2116,7 +2116,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.1 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.4 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD @@ -2591,7 +2591,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2605,7 +2605,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2614,14 +2614,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2642,7 +2642,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2663,7 +2663,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2679,7 +2679,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2695,7 +2695,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2711,7 +2711,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2970,7 +2970,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2979,21 +2979,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.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.23.1-alpine + image: golang:1.23.4-alpine name: test-backend - commands: - apk add --update build-base @@ -3002,7 +3002,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: test-backend-integration trigger: branch: @@ -3045,22 +3045,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: validate-openapi-spec trigger: branch: @@ -3139,7 +3139,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3153,7 +3153,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3162,14 +3162,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3190,7 +3190,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3211,7 +3211,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3227,7 +3227,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3243,7 +3243,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3259,7 +3259,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3359,7 +3359,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3491,7 +3491,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3632,7 +3632,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3724,7 +3724,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3824,7 +3824,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3921,7 +3921,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -3983,7 +3983,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.1 + GO_VERSION: 1.23.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4058,7 +4058,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.1 + GO_VERSION: 1.23.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4115,13 +4115,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: whats-new-checker trigger: event: @@ -4220,7 +4220,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.1 + GO_VERSION: 1.23.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4371,7 +4371,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4380,21 +4380,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.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.23.1-alpine + image: golang:1.23.4-alpine name: test-backend - commands: - apk add --update build-base @@ -4403,7 +4403,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: test-backend-integration trigger: cron: @@ -4457,7 +4457,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.1 + GO_VERSION: 1.23.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4601,7 +4601,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.1 + GO_VERSION: 1.23.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4708,7 +4708,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.1 + - --go-version=1.23.4 depends_on: - github-app-generate-token environment: @@ -4729,7 +4729,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.1 + GO_VERSION: 1.23.4 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4863,7 +4863,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4872,14 +4872,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4900,7 +4900,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4921,7 +4921,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4937,7 +4937,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4953,7 +4953,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -4969,7 +4969,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.1-alpine + image: golang:1.23.4-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5272,7 +5272,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.1-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.4-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.11.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -5310,7 +5310,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.1-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.4-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.11.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -5579,6 +5579,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 9f0a6d29cd6f5e368fb6d63f26ab213d668ac099e3b8e653dbf4b074e7ef0a1a +hmac: bdf4cd3767ad13e5a8d7221731676e8ee1991dae0da9ae2cee92087d5c660ece ... diff --git a/Makefile b/Makefile index 424c2a6c231..88657f0cf77 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.23.1 +GO_VERSION = 1.23.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/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index 25ea30979b6..1b6cc345dd7 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.23.1 +go 1.23.4 replace github.com/grafana/grafana => ../../.. diff --git a/go.mod b/go.mod index 70876ec2cc9..14ca0f3616a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.23.1 +go 1.23.4 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling diff --git a/go.work b/go.work index a2026119223..78c561488f2 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23.1 +go 1.23.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/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index 53a64c6a9a7..c0f249a8706 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.4 replace ( github.com/grafana/grafana => ../../../.. diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index 192b0ab2be1..223028ebbf3 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.4 replace ( github.com/grafana/grafana => ../../../.. diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index bd9536ee040..ec9e803a101 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.1" -golang_version = "1.23.1" +golang_version = "1.23.4" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "22.11.0"