IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-25 16:31:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump Go to 1.21.9 (#85964)

Browse Source 
* chore: bump Go to 1.21.9

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>

* regen .drone.yml

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>

---------

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Dave Henderson 2024-04-11 15:37:07 -04:00 committed by GitHub
parent a39fe593c2
commit 5cfca8dbf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bingo/golangci-lint.mod
View File

@ -2,6 +2,6 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.21 go 1.21
toolchain go1.21.6 toolchain go1.21.9
require github.com/golangci/golangci-lint v1.57.1 // cmd/golangci-lint require github.com/golangci/golangci-lint v1.57.1 // cmd/golangci-lint

208
.drone.yml
View File

@ -25,7 +25,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build verify-drone - ./bin/build verify-drone
@ -76,14 +76,14 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- go install github.com/bazelbuild/buildtools/buildifier@latest - go install github.com/bazelbuild/buildtools/buildifier@latest
- buildifier --lint=warn -mode=check -r . - buildifier --lint=warn -mode=check -r .
depends_on: depends_on:
- compile-build-cmd - compile-build-cmd
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: lint-starlark name: lint-starlark
trigger: trigger:
event: event:
@ -323,7 +323,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -332,14 +332,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
@ -347,7 +347,7 @@ steps:
-timeout=5m -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -356,7 +356,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
event: event:
@ -408,7 +408,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- apk add --update curl jq bash - apk add --update curl jq bash
@ -435,7 +435,7 @@ steps:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update make build-base - apk add --update make build-base
@ -444,16 +444,16 @@ steps:
- wire-install - wire-install
environment: environment:
CGO_ENABLED: "1" CGO_ENABLED: "1"
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: lint-backend name: lint-backend
- commands: - commands:
- go run scripts/modowners/modowners.go check go.mod - go run scripts/modowners/modowners.go check go.mod
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: validate-modfile name: validate-modfile
- commands: - commands:
- apk add --update make - apk add --update make
- make swagger-validate - make swagger-validate
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: validate-openapi-spec name: validate-openapi-spec
trigger: trigger:
event: event:
@ -512,7 +512,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -522,7 +522,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -531,14 +531,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@ -572,7 +572,7 @@ steps:
from_secret: drone_token from_secret: drone_token
- commands: - commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 --go-version=1.21.8 --yarn-cache=$$YARN_CACHE_FOLDER -a targz:grafana:linux/arm/v7 --go-version=1.21.9 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on: depends_on:
- yarn-install - yarn-install
@ -775,7 +775,7 @@ steps:
- /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu - /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/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 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.21.8 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ --go-version=1.21.9 --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 }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@ -919,7 +919,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@ -933,7 +933,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -942,14 +942,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -970,7 +970,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s - dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -991,7 +991,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57 MYSQL_HOST: mysql57
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-5.7-integration-tests name: mysql-5.7-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -1012,7 +1012,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -1028,7 +1028,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -1044,7 +1044,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -1060,7 +1060,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
event: event:
@ -1149,7 +1149,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
event: event:
@ -1190,7 +1190,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- apt-get update -yq && apt-get install shellcheck - apt-get update -yq && apt-get install shellcheck
@ -1262,7 +1262,7 @@ steps:
environment: environment:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: swagger-gen name: swagger-gen
trigger: trigger:
event: event:
@ -1358,7 +1358,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -1369,7 +1369,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: depends_on:
- clone-enterprise - clone-enterprise
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1379,14 +1379,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: depends_on:
- clone-enterprise - clone-enterprise
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1394,7 +1394,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: sqlite-benchmark-integration-tests name: sqlite-benchmark-integration-tests
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1406,7 +1406,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: postgres-benchmark-integration-tests name: postgres-benchmark-integration-tests
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1417,7 +1417,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57 MYSQL_HOST: mysql57
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-5.7-benchmark-integration-tests name: mysql-5.7-benchmark-integration-tests
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1428,7 +1428,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-8.0-benchmark-integration-tests name: mysql-8.0-benchmark-integration-tests
trigger: trigger:
event: event:
@ -1507,7 +1507,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
branch: main branch: main
@ -1684,7 +1684,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1693,14 +1693,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
@ -1708,7 +1708,7 @@ steps:
-timeout=5m -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1717,7 +1717,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
branch: main branch: main
@ -1762,13 +1762,13 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update make build-base - apk add --update make build-base
@ -1777,16 +1777,16 @@ steps:
- wire-install - wire-install
environment: environment:
CGO_ENABLED: "1" CGO_ENABLED: "1"
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: lint-backend name: lint-backend
- commands: - commands:
- go run scripts/modowners/modowners.go check go.mod - go run scripts/modowners/modowners.go check go.mod
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: validate-modfile name: validate-modfile
- commands: - commands:
- apk add --update make - apk add --update make
- make swagger-validate - make swagger-validate
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: validate-openapi-spec name: validate-openapi-spec
- commands: - commands:
- ./bin/build verify-drone - ./bin/build verify-drone
@ -1843,7 +1843,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -1853,7 +1853,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1862,14 +1862,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@ -1902,7 +1902,7 @@ steps:
name: build-frontend-packages name: build-frontend-packages
- commands: - commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 --go-version=1.21.8 --yarn-cache=$$YARN_CACHE_FOLDER -a targz:grafana:linux/arm/v7 --go-version=1.21.9 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on: depends_on:
- update-package-json-version - update-package-json-version
@ -2141,7 +2141,7 @@ steps:
- /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu - /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/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 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.21.8 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ --go-version=1.21.9 --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 }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@ -2347,7 +2347,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@ -2361,7 +2361,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2370,14 +2370,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2398,7 +2398,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s - dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -2419,7 +2419,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57 MYSQL_HOST: mysql57
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-5.7-integration-tests name: mysql-5.7-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2440,7 +2440,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -2456,7 +2456,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2472,7 +2472,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -2488,7 +2488,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
branch: main branch: main
@ -2681,7 +2681,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts docker fetch --edition oss - ./bin/build artifacts docker fetch --edition oss
@ -2778,7 +2778,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@ -2848,7 +2848,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@ -2915,7 +2915,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- depends_on: - depends_on:
- compile-build-cmd - compile-build-cmd
@ -3022,7 +3022,7 @@ steps:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
GO_VERSION: 1.21.8 GO_VERSION: 1.21.9
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3080,13 +3080,13 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build whatsnew-checker - ./bin/build whatsnew-checker
depends_on: depends_on:
- compile-build-cmd - compile-build-cmd
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: whats-new-checker name: whats-new-checker
trigger: trigger:
event: event:
@ -3189,7 +3189,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3198,14 +3198,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
@ -3213,7 +3213,7 @@ steps:
-timeout=5m -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -3222,7 +3222,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
event: event:
@ -3279,7 +3279,7 @@ steps:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
GO_VERSION: 1.21.8 GO_VERSION: 1.21.9
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3462,7 +3462,7 @@ steps:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
GO_VERSION: 1.21.8 GO_VERSION: 1.21.9
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3612,7 +3612,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3621,14 +3621,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
@ -3636,7 +3636,7 @@ steps:
-timeout=5m -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -3645,7 +3645,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
cron: cron:
@ -3700,7 +3700,7 @@ steps:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
GO_VERSION: 1.21.8 GO_VERSION: 1.21.9
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3847,7 +3847,7 @@ steps:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
GO_VERSION: 1.21.8 GO_VERSION: 1.21.9
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3956,7 +3956,7 @@ steps:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
GO_VERSION: 1.21.8 GO_VERSION: 1.21.9
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -4046,20 +4046,20 @@ steps:
- commands: [] - commands: []
depends_on: depends_on:
- clone - clone
image: golang:1.21.8-windowsservercore-1809 image: golang:1.21.9-windowsservercore-1809
name: windows-init name: windows-init
- commands: - commands:
- go install github.com/google/wire/cmd/wire@v0.5.0 - go install github.com/google/wire/cmd/wire@v0.5.0
- wire gen -tags oss ./pkg/server - wire gen -tags oss ./pkg/server
depends_on: depends_on:
- windows-init - windows-init
image: golang:1.21.8-windowsservercore-1809 image: golang:1.21.9-windowsservercore-1809
name: wire-install name: wire-install
- commands: - commands:
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.21.8-windowsservercore-1809 image: golang:1.21.9-windowsservercore-1809
name: test-backend name: test-backend
trigger: trigger:
event: event:
@ -4152,7 +4152,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -4161,14 +4161,14 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -4189,7 +4189,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s - dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -4210,7 +4210,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57 MYSQL_HOST: mysql57
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-5.7-integration-tests name: mysql-5.7-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -4231,7 +4231,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -4247,7 +4247,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -4263,7 +4263,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -4279,7 +4279,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.21.8-alpine image: golang:1.21.9-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
event: event:
@ -4633,7 +4633,7 @@ steps:
path: /root/.docker/ path: /root/.docker/
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.8-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.9-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
@ -4668,7 +4668,7 @@ steps:
path: /root/.docker/ path: /root/.docker/
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.8-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.9-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
@ -4923,6 +4923,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 3596a353e66a06fa7e6d1e710eb21f649689c67df5c02982cc27087009d3739b hmac: 2f4db495ad0b69ef6afd86eac7aea7101f0b8f6ec1aadea0e2860b196304a258
... ...

2
.github/workflows/alerting-swagger-gen.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
- name: Set go version - name: Set go version
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.21.8' go-version: '1.21.9'
- name: Build swagger - name: Build swagger
run: | run: |
make -C pkg/services/ngalert/api/tooling post.json api.json make -C pkg/services/ngalert/api/tooling post.json api.json

2
.github/workflows/bump-version.yml vendored
View File

@ -58,7 +58,7 @@ jobs:
# Go is required for also updating the schema versions as part of the precommit hook: # Go is required for also updating the schema versions as part of the precommit hook:
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.21' go-version: '1.21.9'
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: '18' node-version: '18'

2
.github/workflows/codeql-analysis.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
name: Set go version name: Set go version
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.21.8' go-version: '1.21.9'
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

2
.github/workflows/pr-codeql-analysis-go.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
- name: Set go version - name: Set go version
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.21.8' go-version: '1.21.9'
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

4
.github/workflows/pr-go-workspace-check.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
- name: Set go version - name: Set go version
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.21.8' go-version: '1.21.9'
- name: Workspace Sync - name: Workspace Sync
run: go work sync run: go work sync
@ -46,4 +46,4 @@ jobs:
git diff git diff
echo "Please run 'make build-go' and commit the changes." echo "Please run 'make build-go' and commit the changes."
exit 1 exit 1
fi fi

2
.github/workflows/publish-kinds-next.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
- name: "Setup Go" - name: "Setup Go"
uses: "actions/setup-go@v4" uses: "actions/setup-go@v4"
with: with:
go-version: '1.21.8' go-version: '1.21.9'
- name: "Verify kinds" - name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go run: go run .github/workflows/scripts/kinds/verify-kinds.go

2
.github/workflows/publish-kinds-release.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
- name: "Setup Go" - name: "Setup Go"
uses: "actions/setup-go@v4" uses: "actions/setup-go@v4"
with: with:
go-version: '1.21.8' go-version: '1.21.9'
- name: "Verify kinds" - name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go run: go run .github/workflows/scripts/kinds/verify-kinds.go

2
.github/workflows/verify-kinds.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- name: "Setup Go" - name: "Setup Go"
uses: "actions/setup-go@v4" uses: "actions/setup-go@v4"
with: with:
go-version: '1.21.8' go-version: '1.21.9'
- name: "Verify kinds" - name: "Verify kinds"
run: go run .github/workflows/scripts/kinds/verify-kinds.go run: go run .github/workflows/scripts/kinds/verify-kinds.go

2
Dockerfile
View File

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

2
Makefile
View File

@ -297,7 +297,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \ --build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \ --build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
--build-arg BASE_IMAGE=ubuntu:22.04 \ --build-arg BASE_IMAGE=ubuntu:22.04 \
--build-arg GO_IMAGE=golang:1.21.8 \ --build-arg GO_IMAGE=golang:1.21.9 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS) $(DOCKER_BUILD_ARGS)

2
scripts/drone/variables.star
View File

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