IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-21 16:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Bump Go to 1.23.1 (#93007)

Browse Source 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Dave Henderson 2024-09-06 13:58:50 -04:00 committed by GitHub
parent 2218841aa6
commit e1090db5d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 139 additions and 735 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
.drone.yml
View File

@ -25,7 +25,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@ -76,14 +76,14 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- go install github.com/bazelbuild/buildtools/buildifier@latest
- buildifier --lint=warn -mode=check -r .
depends_on:
- compile-build-cmd
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: lint-starlark
trigger:
event:
@ -377,7 +377,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -386,21 +386,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -409,7 +409,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: test-backend-integration
trigger:
event:
@ -461,7 +461,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@ -488,16 +488,16 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: validate-openapi-spec
trigger:
event:
@ -556,7 +556,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -566,7 +566,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -575,14 +575,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- yarn install --immutable || yarn install --immutable
@ -615,7 +615,7 @@ steps:
from_secret: drone_token
- commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 --go-version=1.23.0 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.23.1 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- yarn-install
@ -868,7 +868,7 @@ steps:
- /src/grafana-build artifacts -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 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.23.0 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
--go-version=1.23.1 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
.version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@ -1012,7 +1012,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -1026,7 +1026,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1035,14 +1035,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -1063,7 +1063,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -1084,7 +1084,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -1105,7 +1105,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -1121,7 +1121,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -1137,7 +1137,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -1154,7 +1154,7 @@ steps:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
failure: ignore
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -1242,7 +1242,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
trigger:
event:
@ -1283,7 +1283,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@ -1355,7 +1355,7 @@ steps:
environment:
GITHUB_TOKEN:
from_secret: github_token
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: swagger-gen
trigger:
event:
@ -1451,7 +1451,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1462,7 +1462,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1472,14 +1472,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- apk add --update build-base
@ -1487,7 +1487,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1499,7 +1499,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1510,7 +1510,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1521,7 +1521,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@ -1599,7 +1599,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
trigger:
branch: main
@ -1772,7 +1772,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1781,21 +1781,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -1804,7 +1804,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: test-backend-integration
trigger:
branch: main
@ -1849,22 +1849,22 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: validate-openapi-spec
- commands:
- ./bin/build verify-drone
@ -1981,7 +1981,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1991,7 +1991,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2000,14 +2000,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- yarn install --immutable || yarn install --immutable
@ -2039,7 +2039,7 @@ steps:
name: build-frontend-packages
- commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 --go-version=1.23.0 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.23.1 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- update-package-json-version
@ -2328,7 +2328,7 @@ steps:
- /src/grafana-build artifacts -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 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.23.0 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
--go-version=1.23.1 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
.version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@ -2534,7 +2534,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -2548,7 +2548,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2557,14 +2557,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2585,7 +2585,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -2606,7 +2606,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2627,7 +2627,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -2643,7 +2643,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2659,7 +2659,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -2676,7 +2676,7 @@ steps:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
failure: ignore
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@ -2986,7 +2986,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2995,21 +2995,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3018,7 +3018,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: test-backend-integration
trigger:
branch:
@ -3061,22 +3061,22 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: validate-openapi-spec
trigger:
branch:
@ -3166,7 +3166,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -3180,7 +3180,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3189,14 +3189,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -3217,7 +3217,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -3238,7 +3238,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -3259,7 +3259,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -3275,7 +3275,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -3291,7 +3291,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -3308,7 +3308,7 @@ steps:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
failure: ignore
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: remote-alertmanager-integration-tests
trigger:
branch:
@ -3411,7 +3411,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@ -3542,7 +3542,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@ -3678,7 +3678,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@ -3763,7 +3763,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- yarn install --immutable || yarn install --immutable
@ -3987,7 +3987,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@ -4205,7 +4205,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.23.0
GO_VERSION: 1.23.1
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -4263,13 +4263,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: whats-new-checker
trigger:
event:
@ -4371,7 +4371,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-alpine
name: test-backend-integration
trigger:
event:
@ -4460,7 +4460,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.23.0
GO_VERSION: 1.23.1
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -4643,7 +4643,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.23.0
GO_VERSION: 1.23.1
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -4792,7 +4792,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -4801,21 +4801,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-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.0-alpine
image: golang:1.23.1-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -4824,7 +4824,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: test-backend-integration
trigger:
cron:
@ -4879,7 +4879,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.23.0
GO_VERSION: 1.23.1
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -5026,7 +5026,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.23.0
GO_VERSION: 1.23.1
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -5115,7 +5115,7 @@ steps:
- commands:
- '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.0
- --go-version=1.23.1
environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token
@ -5136,7 +5136,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.23.0
GO_VERSION: 1.23.1
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -5226,20 +5226,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.23.0-windowsservercore-1809
image: golang:1.23.1-windowsservercore-1809
name: windows-init
- commands:
- go install github.com/google/wire/cmd/wire@v0.5.0
- wire gen -tags oss ./pkg/server
depends_on:
- windows-init
image: golang:1.23.0-windowsservercore-1809
image: golang:1.23.1-windowsservercore-1809
name: wire-install
- commands:
- go test -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.23.0-windowsservercore-1809
image: golang:1.23.1-windowsservercore-1809
name: test-backend
trigger:
event:
@ -5332,7 +5332,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -5341,14 +5341,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -5369,7 +5369,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -5390,7 +5390,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -5411,7 +5411,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -5427,7 +5427,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -5443,7 +5443,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -5460,7 +5460,7 @@ steps:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
failure: ignore
image: golang:1.23.0-alpine
image: golang:1.23.1-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -5815,7 +5815,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.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.1-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
@ -5852,7 +5852,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.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.1-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
@ -6108,6 +6108,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 2d2609164c9a0848f1ea367a2cf2bcc7cd82f1b8f6507261b719a56d58795afc
hmac: 64d991988575d9d3a608d0be4fae0d5e6b903b015d9b060e3254b5107ccc4ad7
...

2
Dockerfile
View File

@ -3,7 +3,7 @@
ARG BASE_IMAGE=alpine:3.19.1
ARG JS_IMAGE=node:20-alpine
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.23.0-alpine
ARG GO_IMAGE=golang:1.23.1-alpine
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder

2
Makefile
View File

@ -8,7 +8,7 @@ WIRE_TAGS = "oss"
include .bingo/Variables.mk
GO = go
GO_VERSION = 1.23.0
GO_VERSION = 1.23.1
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)

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana
go 1.23.0
go 1.23.1
// contains openapi encoder fixes. remove ASAP
replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code

2
go.work
View File

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

596
go.work.sum
View File

File diff suppressed because it is too large Load Diff

2
hack/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/hack
go 1.23.0
go 1.23.1
require k8s.io/code-generator v0.31.0

2
pkg/aggregator/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/aggregator
go 1.23.0
go 1.23.1
require (
github.com/emicklei/go-restful/v3 v3.11.0

2
pkg/apimachinery/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apimachinery
go 1.23.0
go 1.23.1
require (
github.com/grafana/authlib v0.0.0-20240903121118-16441568af1e // @grafana/identity-access-team

2
pkg/apiserver/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apiserver
go 1.23.0
go 1.23.1
require (
github.com/google/go-cmp v0.6.0

2
pkg/build/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build
go 1.23.0
go 1.23.1
// Override docker/docker to avoid:
// go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires

2
pkg/build/wire/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build/wire
go 1.23.0
go 1.23.1
require (
github.com/google/go-cmp v0.6.0

2
pkg/promlib/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/promlib
go 1.23.0
go 1.23.1
require (
github.com/grafana/dskit v0.0.0-20240805174438-dfa83b4ed2d3

2
pkg/semconv/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/semconv
go 1.23.0
go 1.23.1
require go.opentelemetry.io/otel v1.29.0

2
pkg/storage/unified/apistore/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/storage/unified/apistore
go 1.23.0
go 1.23.1
require (
github.com/grafana/authlib/claims v0.0.0-20240903121118-16441568af1e

2
pkg/storage/unified/resource/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/storage/unified/resource
go 1.23.0
go 1.23.1
require (
github.com/fullstorydev/grpchan v1.1.1

2
scripts/drone/variables.star
View File

@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.50"
golang_version = "1.23.0"
golang_version = "1.23.1"
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "20.9.0"

2
scripts/go-workspace/go.mod
View File

@ -1,5 +1,5 @@
module github.com/grafana/grafana/scripts/go-workspace
go 1.23.0
go 1.23.1
require golang.org/x/mod v0.20.0