public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.1.x] Chore: Bump Go to 1.22.7 (#93355)

Browse Source 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
(cherry picked from commit c9741a5e0c)
This commit is contained in:
Dave Henderson
2024-09-18 17:10:20 +03:00
committed by GitHub
parent 56383725f3
commit dbc7496a00
12 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+104 -104
View File
@@ -25,7 +25,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-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.4-alpine
image: golang:1.22.7-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.4-alpine
image: golang:1.22.7-alpine
name: lint-starlark
trigger:
event:
@@ -319,7 +319,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -328,14 +328,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@@ -343,7 +343,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -352,7 +352,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend-integration
trigger:
event:
@@ -404,7 +404,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@@ -431,16 +431,16 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: validate-openapi-spec
trigger:
event:
@@ -499,7 +499,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -509,7 +509,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -518,14 +518,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- yarn install --immutable || yarn install --immutable
@@ -558,7 +558,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.4 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.22.7 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- yarn-install
@@ -762,7 +762,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.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
--go-version=1.22.7 --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
@@ -906,7 +906,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@@ -920,7 +920,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -929,14 +929,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -957,7 +957,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -978,7 +978,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -999,7 +999,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -1015,7 +1015,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -1031,7 +1031,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -1047,7 +1047,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@@ -1135,7 +1135,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
trigger:
event:
@@ -1176,7 +1176,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@@ -1248,7 +1248,7 @@ steps:
environment:
GITHUB_TOKEN:
from_secret: github_token
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: swagger-gen
trigger:
event:
@@ -1344,7 +1344,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1355,7 +1355,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1365,14 +1365,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- apk add --update build-base
@@ -1380,7 +1380,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1392,7 +1392,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1403,7 +1403,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1414,7 +1414,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@@ -1492,7 +1492,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
trigger:
branch: main
@@ -1665,7 +1665,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1674,14 +1674,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@@ -1689,7 +1689,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -1698,7 +1698,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend-integration
trigger:
branch: main
@@ -1743,22 +1743,22 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: validate-openapi-spec
- commands:
- ./bin/build verify-drone
@@ -1815,7 +1815,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1825,7 +1825,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1834,14 +1834,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- yarn install --immutable || yarn install --immutable
@@ -1873,7 +1873,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.4 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.22.7 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- update-package-json-version
@@ -2113,7 +2113,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.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{
--go-version=1.22.7 --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
@@ -2319,7 +2319,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@@ -2333,7 +2333,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2342,14 +2342,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -2370,7 +2370,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -2391,7 +2391,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -2412,7 +2412,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -2428,7 +2428,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2444,7 +2444,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -2460,7 +2460,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@@ -2653,7 +2653,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@@ -2784,7 +2784,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@@ -2920,7 +2920,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -3005,7 +3005,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- yarn install --immutable || yarn install --immutable
@@ -3229,7 +3229,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@@ -3447,7 +3447,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.4
GO_VERSION: 1.22.7
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3505,13 +3505,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: whats-new-checker
trigger:
event:
@@ -3613,7 +3613,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3622,14 +3622,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@@ -3637,7 +3637,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -3646,7 +3646,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend-integration
trigger:
event:
@@ -3703,7 +3703,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.4
GO_VERSION: 1.22.7
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3886,7 +3886,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.4
GO_VERSION: 1.22.7
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -4035,7 +4035,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -4044,14 +4044,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
@@ -4059,7 +4059,7 @@ steps:
-timeout=5m
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -4068,7 +4068,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: test-backend-integration
trigger:
cron:
@@ -4123,7 +4123,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.4
GO_VERSION: 1.22.7
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -4270,7 +4270,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.4
GO_VERSION: 1.22.7
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -4359,7 +4359,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.22.4
- --go-version=1.22.7
environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token
@@ -4380,7 +4380,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.22.4
GO_VERSION: 1.22.7
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -4470,20 +4470,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.22.4-windowsservercore-1809
image: golang:1.22.7-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.4-windowsservercore-1809
image: golang:1.22.7-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.4-windowsservercore-1809
image: golang:1.22.7-windowsservercore-1809
name: test-backend
trigger:
event:
@@ -4576,7 +4576,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -4585,14 +4585,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -4613,7 +4613,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -4634,7 +4634,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -4655,7 +4655,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -4671,7 +4671,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -4687,7 +4687,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -4703,7 +4703,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.22.4-alpine
image: golang:1.22.7-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@@ -5058,7 +5058,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.22.4-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.7-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
@@ -5095,7 +5095,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.22.4-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.7-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
@@ -5351,6 +5351,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: a4795631c5fa66603119a6c9318e8934a334e96271e27539366089923abf28f4
hmac: 71fb0119e2c781ccb3f43f8207ccd54d240fd2b9f3a15f8e1a0fbfaf19f964f4
...
Dockerfile
+1 -1
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.4-alpine
ARG GO_IMAGE=golang:1.22.7-alpine
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder
Makefile
+1 -1
View File
@@ -9,7 +9,7 @@ include .bingo/Variables.mk
GO = go
GO_VERSION = 1.22.4
GO_VERSION = 1.22.7
GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/...
SH_FILES ?= $(shell find ./scripts -name *.sh)
GO_RACE := $(shell [ -n "$(GO_RACE)" -o -e ".go-race-enabled-locally" ] && echo 1 )
apps/.gitkeep
+1
View File
@@ -0,0 +1 @@
# workaround for grafana-build quirk
go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana
go 1.22.4
go 1.22.7
// Override docker/docker to avoid:
// go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
go.work
+1 -1
View File
@@ -1,4 +1,4 @@
go 1.22.4
go 1.22.7
use (
.
pkg/apimachinery/go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apimachinery
go 1.21.10
go 1.22.7
require (
k8s.io/apimachinery v0.29.3
pkg/apiserver/go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apiserver
go 1.21.10
go 1.22.7
require (
github.com/bwmarrin/snowflake v0.3.0
pkg/build/go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build
go 1.22.4
go 1.22.7
// Override docker/docker to avoid:
// go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
pkg/build/wire/go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build/wire
go 1.22.4
go 1.22.7
require (
github.com/google/go-cmp v0.6.0
pkg/promlib/go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/promlib
go 1.21.10
go 1.22.7
require (
github.com/grafana/grafana-plugin-sdk-go v0.234.0
scripts/drone/variables.star
+1 -1
View File
@@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.50"
golang_version = "1.22.4"
golang_version = "1.22.7"
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "20.9.0"