Chore: Upgrade Go to 1.20.10 (#76359)

This commit is contained in:
Horst Gutmann
2023-10-11 15:49:24 +02:00
committed by GitHub
parent 755805597b
commit 6b52bb9c27
11 changed files with 111 additions and 111 deletions

View File

@ -24,7 +24,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@ -74,14 +74,14 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-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.20.8-alpine
image: golang:1.20.10-alpine
name: lint-starlark
trigger:
event:
@ -316,7 +316,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -325,21 +325,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -348,7 +348,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend-integration
trigger:
event:
@ -397,7 +397,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@ -424,7 +424,7 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update make build-base
@ -433,16 +433,16 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: validate-openapi-spec
trigger:
event:
@ -498,7 +498,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -508,7 +508,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -517,14 +517,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- yarn install --immutable
@ -587,7 +587,7 @@ steps:
token:
from_secret: drone_token
- commands:
- /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.8
- /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.10
--yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
> packages.txt
depends_on:
@ -871,7 +871,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -885,7 +885,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -894,14 +894,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -922,7 +922,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -943,7 +943,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -964,7 +964,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -979,7 +979,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -994,7 +994,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir:8080 -timeout 120s
@ -1007,7 +1007,7 @@ steps:
depends_on:
- wire-install
- wait-for-remote-alertmanager
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -1093,7 +1093,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
trigger:
event:
@ -1133,7 +1133,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@ -1240,7 +1240,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1251,7 +1251,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1261,14 +1261,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update build-base
@ -1276,7 +1276,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1288,7 +1288,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1299,7 +1299,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1310,7 +1310,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@ -1386,7 +1386,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
trigger:
branch: main
@ -1558,7 +1558,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1567,21 +1567,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -1590,7 +1590,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend-integration
trigger:
branch: main
@ -1634,13 +1634,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update make build-base
@ -1649,16 +1649,16 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: validate-openapi-spec
- commands:
- ./bin/build verify-drone
@ -1714,7 +1714,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1724,7 +1724,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1733,14 +1733,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- yarn install --immutable
@ -1771,7 +1771,7 @@ steps:
image: node:18.12.0-alpine
name: build-frontend-packages
- commands:
- /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.8
- /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.10
--yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
> packages.txt
depends_on:
@ -2153,7 +2153,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -2167,7 +2167,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2176,14 +2176,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2204,7 +2204,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -2225,7 +2225,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2246,7 +2246,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -2261,7 +2261,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2276,7 +2276,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir:8080 -timeout 120s
@ -2289,7 +2289,7 @@ steps:
depends_on:
- wire-install
- wait-for-remote-alertmanager
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@ -2511,7 +2511,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@ -2607,7 +2607,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@ -2676,7 +2676,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- yarn install --immutable
@ -2705,7 +2705,7 @@ steps:
NPM_TOKEN:
from_secret: npm_token
failure: ignore
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: release-npm-packages
trigger:
event:
@ -2741,7 +2741,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@ -2846,7 +2846,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.8
GO_VERSION: 1.20.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -2902,13 +2902,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: whats-new-checker
trigger:
event:
@ -3008,7 +3008,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3017,21 +3017,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3040,7 +3040,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend-integration
trigger:
event:
@ -3095,7 +3095,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.8
GO_VERSION: 1.20.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3276,7 +3276,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.8
GO_VERSION: 1.20.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3421,7 +3421,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3430,21 +3430,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3453,7 +3453,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: test-backend-integration
trigger:
cron:
@ -3506,7 +3506,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.8
GO_VERSION: 1.20.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3650,7 +3650,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.8
GO_VERSION: 1.20.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3746,20 +3746,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.20.8-windowsservercore-1809
image: golang:1.20.10-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.20.8-windowsservercore-1809
image: golang:1.20.10-windowsservercore-1809
name: wire-install
- commands:
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.8-windowsservercore-1809
image: golang:1.20.10-windowsservercore-1809
name: test-backend
trigger:
event:
@ -3851,7 +3851,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3860,14 +3860,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -3888,7 +3888,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -3909,7 +3909,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -3930,7 +3930,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -3945,7 +3945,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -3960,7 +3960,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir:8080 -timeout 120s
@ -3973,7 +3973,7 @@ steps:
depends_on:
- wire-install
- wait-for-remote-alertmanager
image: golang:1.20.8-alpine
image: golang:1.20.10-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -4379,7 +4379,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.20.8-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.10-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:18.12.0-alpine
- 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
@ -4413,7 +4413,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.20.8-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.10-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:18.12.0-alpine
- 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
@ -4661,6 +4661,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 68c3d5cfb08c1e5384f39ea57badfd6dbb46943a87d54571665ec29a1257b707
hmac: efc8706531a40b72753d483d3d8a7ba4941b5f54e0b21a68bcf47556a97a9ede
...

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@
ARG BASE_IMAGE=alpine:3.18.3
ARG JS_IMAGE=node:18-alpine3.18
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.20.8-alpine3.18
ARG GO_IMAGE=golang:1.20.10-alpine3.18
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder

View File

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

View File

@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
# Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
FROM debian:buster-20220822
ENV GOVERSION=1.20.8 \
ENV GOVERSION=1.20.10 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=18.12.0-1nodesource1 \

View File

@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.42"
golang_version = "1.20.8"
golang_version = "1.20.10"
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "18.12.0"