bumping go to 1.25.6

This commit is contained in:
Timur Olzhabayev 2024-01-17 11:38:25 +01:00
parent 58b13fed5a
commit 73439f2cd3
No known key found for this signature in database
11 changed files with 112 additions and 112 deletions

View File

@ -24,7 +24,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@ -74,14 +74,14 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-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.21.5-alpine3.18
image: golang:1.21.6-alpine
name: lint-starlark
trigger:
event:
@ -317,7 +317,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -326,21 +326,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-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.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -349,7 +349,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend-integration
trigger:
event:
@ -399,7 +399,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@ -426,7 +426,7 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- apk add --update make build-base
@ -435,16 +435,16 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: validate-openapi-spec
trigger:
event:
@ -500,7 +500,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -510,7 +510,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -519,14 +519,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- yarn install --immutable
@ -559,7 +559,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.21.5 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.21.6 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- yarn-install
@ -844,7 +844,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -858,7 +858,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -867,14 +867,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -895,7 +895,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -916,7 +916,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -937,7 +937,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -952,7 +952,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -967,7 +967,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -983,7 +983,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -1070,7 +1070,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
trigger:
event:
@ -1110,7 +1110,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@ -1177,7 +1177,7 @@ steps:
environment:
GITHUB_TOKEN:
from_secret: github_token
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: swagger-gen
trigger:
event:
@ -1278,7 +1278,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1289,7 +1289,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1299,14 +1299,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- apk add --update build-base
@ -1314,7 +1314,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1326,7 +1326,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1337,7 +1337,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@ -1348,7 +1348,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@ -1425,7 +1425,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
trigger:
branch: main
@ -1598,7 +1598,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1607,21 +1607,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-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.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -1630,7 +1630,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend-integration
trigger:
branch: main
@ -1674,13 +1674,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- apk add --update make build-base
@ -1689,16 +1689,16 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: validate-modfile
- commands:
- apk add --update make
- make swagger-validate
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: validate-openapi-spec
- commands:
- ./bin/build verify-drone
@ -1754,7 +1754,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@ -1764,7 +1764,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -1773,14 +1773,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- yarn install --immutable
@ -1812,7 +1812,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.21.5 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.21.6 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- update-package-json-version
@ -2195,7 +2195,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@ -2209,7 +2209,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -2218,14 +2218,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2246,7 +2246,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -2267,7 +2267,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2288,7 +2288,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -2303,7 +2303,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2318,7 +2318,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -2334,7 +2334,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@ -2524,7 +2524,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@ -2620,7 +2620,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@ -2689,7 +2689,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- yarn install --immutable
@ -2754,7 +2754,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@ -2860,7 +2860,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.5
GO_VERSION: 1.21.6
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -2917,13 +2917,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: whats-new-checker
trigger:
event:
@ -3023,7 +3023,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3032,21 +3032,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-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.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3055,7 +3055,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend-integration
trigger:
event:
@ -3111,7 +3111,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.5
GO_VERSION: 1.21.6
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3291,7 +3291,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.5
GO_VERSION: 1.21.6
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3437,7 +3437,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3446,21 +3446,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-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.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend
- commands:
- apk add --update build-base
@ -3469,7 +3469,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: test-backend-integration
trigger:
cron:
@ -3523,7 +3523,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.5
GO_VERSION: 1.21.6
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3669,7 +3669,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.5
GO_VERSION: 1.21.6
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3777,7 +3777,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.5
GO_VERSION: 1.21.6
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@ -3866,20 +3866,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.21.5-windowsservercore-1809
image: golang:1.21.6-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.21.5-windowsservercore-1809
image: golang:1.21.6-windowsservercore-1809
name: wire-install
- commands:
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.21.5-windowsservercore-1809
image: golang:1.21.6-windowsservercore-1809
name: test-backend
trigger:
event:
@ -3971,7 +3971,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -3980,14 +3980,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@ -4008,7 +4008,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@ -4029,7 +4029,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -4050,7 +4050,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@ -4065,7 +4065,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@ -4080,7 +4080,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -4096,7 +4096,7 @@ steps:
environment:
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.21.5-alpine3.18
image: golang:1.21.6-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@ -4449,7 +4449,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.21.5-alpine3.18
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.6-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 grafana/grafana-ci-deploy:1.3.3
@ -4483,7 +4483,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.21.5-alpine3.18
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.6-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 grafana/grafana-ci-deploy:1.3.3
@ -4731,6 +4731,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: f5bca13f4f753f2c911b11b8a2102a51243ce8a215126d2075dc73f8b7628a4d
hmac: 71fe333473a0ce9be41752e7a5f635c56cf52b5d91a8a2892a03697ca1abf99b
...

View File

@ -16,7 +16,7 @@ jobs:
- name: Set go version
uses: actions/setup-go@v4
with:
go-version: '1.21.5'
go-version: '1.21.6'
- 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.21.5'
go-version: '1.21.6'
# 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.21.5'
go-version: '1.21.6'
# 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.21.5'
go-version: '1.21.6'
- 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.21.5'
go-version: '1.21.6'
- 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.21.5'
go-version: '1.21.6'
- 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.5
ARG JS_IMAGE=node:20-alpine3.18
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.21.5-alpine3.18
ARG GO_IMAGE=golang:1.21.6-alpine3.18
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder

View File

@ -261,7 +261,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.21.5 \
--build-arg GO_IMAGE=golang:1.21.6 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS)

View File

@ -11,7 +11,7 @@ load(
# "go" image can be switched back to golang:{}-alpine once this is resolved https://github.com/mattn/go-sqlite3/pull/1177#issuecomment-1849176090
images = {
"git": "alpine/git:2.40.1",
"go": "golang:{}-alpine3.18".format(golang_version),
"go": "golang:{}-alpine".format(golang_version),
"node": "node:{}-alpine".format(nodejs_version),
"cloudsdk": "google/cloud-sdk:431.0.0",
"publish": "grafana/grafana-ci-deploy:1.3.3",

View File

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