IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade go to 1.22.3 (#87463)

Browse Source
This commit is contained in:
Stephanie Hingtgen 2024-05-07 15:23:21 -05:00 committed by GitHub
parent 1884b03511
commit d365d442fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 116 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
.drone.yml
View File

@ -25,7 +25,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@ -76,14 +76,14 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-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.22.2-alpine
image: golang:1.22.3-alpine
name: lint-starlark
trigger:
event:
@ -323,7 +323,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -332,14 +332,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@ -347,7 +347,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -356,7 +356,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend-integration
trigger:
event:
@ -408,7 +408,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@ -435,7 +435,7 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update make build-base
@ -444,16 +444,16 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: validate-openapi-spec
trigger:
event:
@ -512,7 +512,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -522,7 +522,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -531,14 +531,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@ -572,7 +572,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.22.2 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.22.3 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- yarn-install
@ -776,7 +776,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.22.2 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
--go-version=1.22.3 --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
@ -920,7 +920,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -934,7 +934,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -943,14 +943,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -971,7 +971,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -992,7 +992,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -1013,7 +1013,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -1029,7 +1029,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -1045,7 +1045,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -1061,7 +1061,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -1150,7 +1150,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
trigger:
event:
@ -1191,7 +1191,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@ -1263,7 +1263,7 @@ steps:
environment:
GITHUB_TOKEN:
from_secret: github_token
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: swagger-gen
trigger:
event:
@ -1359,7 +1359,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1370,7 +1370,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1380,14 +1380,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update build-base
@ -1395,7 +1395,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1407,7 +1407,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1418,7 +1418,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1429,7 +1429,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@ -1508,7 +1508,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
trigger:
branch: main
@ -1685,7 +1685,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1694,14 +1694,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@ -1709,7 +1709,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -1718,7 +1718,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend-integration
trigger:
branch: main
@ -1763,13 +1763,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update make build-base
@ -1778,16 +1778,16 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: validate-openapi-spec
- commands:
- ./bin/build verify-drone
@ -1844,7 +1844,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1854,7 +1854,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1863,14 +1863,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@ -1903,7 +1903,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.22.2 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.22.3 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- update-package-json-version
@ -2143,7 +2143,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.22.2 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
--go-version=1.22.3 --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
@ -2349,7 +2349,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -2363,7 +2363,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2372,14 +2372,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2400,7 +2400,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -2421,7 +2421,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2442,7 +2442,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -2458,7 +2458,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2474,7 +2474,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -2490,7 +2490,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@ -2683,7 +2683,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@ -2780,7 +2780,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@ -2850,7 +2850,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@ -2917,7 +2917,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@ -3024,7 +3024,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.2
GO_VERSION: 1.22.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3082,13 +3082,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: whats-new-checker
trigger:
event:
@ -3191,7 +3191,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3200,14 +3200,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@ -3215,7 +3215,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3224,7 +3224,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend-integration
trigger:
event:
@ -3281,7 +3281,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.2
GO_VERSION: 1.22.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3464,7 +3464,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.2
GO_VERSION: 1.22.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3614,7 +3614,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3623,14 +3623,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@ -3638,7 +3638,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3647,7 +3647,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: test-backend-integration
trigger:
cron:
@ -3702,7 +3702,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.2
GO_VERSION: 1.22.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3849,7 +3849,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.2
GO_VERSION: 1.22.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3958,7 +3958,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.2
GO_VERSION: 1.22.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -4048,20 +4048,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.22.2-windowsservercore-1809
image: golang:1.22.3-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.22.2-windowsservercore-1809
image: golang:1.22.3-windowsservercore-1809
name: wire-install
- commands:
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.22.2-windowsservercore-1809
image: golang:1.22.3-windowsservercore-1809
name: test-backend
trigger:
event:
@ -4154,7 +4154,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -4163,14 +4163,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -4191,7 +4191,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -4212,7 +4212,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -4233,7 +4233,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -4249,7 +4249,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -4265,7 +4265,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -4281,7 +4281,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.22.2-alpine
image: golang:1.22.3-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -4635,7 +4635,7 @@ steps:
path: /root/.docker/
- commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.2-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.3-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
@ -4670,7 +4670,7 @@ steps:
path: /root/.docker/
- commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.2-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.3-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
@ -4923,8 +4923,3 @@ get:
path: secret/data/common/gcr
kind: secret
name: gcr_credentials
---
kind: signature
hmac: 165260ab07061f24b2b206251d8d2ae11eadfc90155af178b0ac8982782c4520
...

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

@ -16,7 +16,7 @@ jobs:
- name: Set go version
uses: actions/setup-go@v4
with:
go-version: '1.22.2'
go-version: '1.22.3'
- name: Build swagger
run: |
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:
- uses: actions/setup-go@v4
with:
go-version: '1.22.2'
go-version: '1.22.3'
- uses: actions/setup-node@v4
with:
node-version: '18'

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

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

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

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

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

@ -22,7 +22,7 @@ jobs:
- name: Set go version
uses: actions/setup-go@v4
with:
go-version: '1.22.2'
go-version: '1.22.3'
- name: Workspace Sync
run: go work sync

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

@ -36,7 +36,7 @@ jobs:
- name: "Setup Go"
uses: "actions/setup-go@v4"
with:
go-version: '1.22.2'
go-version: '1.22.3'
- name: "Verify kinds"
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"
uses: "actions/setup-go@v4"
with:
go-version: '1.22.2'
go-version: '1.22.3'
- name: "Verify kinds"
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"
uses: "actions/setup-go@v4"
with:
go-version: '1.22.2'
go-version: '1.22.3'
- name: "Verify kinds"
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 JS_IMAGE=node:20-alpine
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.22.2-alpine
ARG GO_IMAGE=golang:1.22.3-alpine
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder

2
Makefile
View File

@ -9,7 +9,7 @@ include .bingo/Variables.mk
GO = go
GO_VERSION = 1.22.2
GO_VERSION = 1.22.3
GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/...
SH_FILES ?= $(shell find ./scripts -name *.sh)
GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)

2
go.mod
View File

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

2
go.work
View File

@ -1,4 +1,4 @@
go 1.22.2
go 1.22.3
use (
.

2
scripts/drone/variables.star
View File

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