[v10.2.x] Chore: Bumping go to 1.21.6 (#83730)

Chore: Bumping go to 1.21.6 (#80709)

* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23f01)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
This commit is contained in:
Andreas Christou
2024-03-01 13:35:46 +00:00
committed by GitHub
co-authored by Timur Olzhabayev
parent 1002488f23
commit d3ad30f379
13 changed files with 114 additions and 115 deletions
+101 -101
View File
@@ -25,7 +25,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
@@ -76,14 +76,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:
@@ -321,7 +321,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.'
@@ -330,21 +330,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
@@ -353,7 +353,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:
@@ -404,7 +404,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
@@ -431,7 +431,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
@@ -440,16 +440,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:
@@ -506,7 +506,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
@@ -516,7 +516,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.'
@@ -525,14 +525,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
@@ -565,7 +565,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
@@ -851,7 +851,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
@@ -865,7 +865,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.'
@@ -874,14 +874,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
@@ -902,7 +902,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
@@ -923,7 +923,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
@@ -944,7 +944,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
@@ -959,7 +959,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
@@ -974,7 +974,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
@@ -990,7 +990,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:
@@ -1078,7 +1078,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:
@@ -1119,7 +1119,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
@@ -1187,7 +1187,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:
@@ -1289,7 +1289,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
@@ -1300,7 +1300,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.'
@@ -1310,14 +1310,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
@@ -1325,7 +1325,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
@@ -1337,7 +1337,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
@@ -1348,7 +1348,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
@@ -1359,7 +1359,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:
@@ -1437,7 +1437,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
@@ -1612,7 +1612,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.'
@@ -1621,21 +1621,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
@@ -1644,7 +1644,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
@@ -1689,13 +1689,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
@@ -1704,16 +1704,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
@@ -1770,7 +1770,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
@@ -1780,7 +1780,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.'
@@ -1789,14 +1789,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
@@ -1828,7 +1828,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
@@ -2212,7 +2212,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
@@ -2226,7 +2226,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.'
@@ -2235,14 +2235,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
@@ -2263,7 +2263,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
@@ -2284,7 +2284,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
@@ -2305,7 +2305,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
@@ -2320,7 +2320,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
@@ -2335,7 +2335,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
@@ -2351,7 +2351,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
@@ -2544,7 +2544,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
@@ -2641,7 +2641,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}
@@ -2711,7 +2711,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
@@ -2777,7 +2777,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
@@ -2884,7 +2884,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:
@@ -2942,13 +2942,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:
@@ -3050,7 +3050,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.'
@@ -3059,21 +3059,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
@@ -3082,7 +3082,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:
@@ -3139,7 +3139,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:
@@ -3322,7 +3322,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:
@@ -3471,7 +3471,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.'
@@ -3480,21 +3480,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
@@ -3503,7 +3503,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:
@@ -3558,7 +3558,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:
@@ -3705,7 +3705,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:
@@ -3803,20 +3803,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:
@@ -3909,7 +3909,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.'
@@ -3918,14 +3918,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
@@ -3946,7 +3946,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
@@ -3967,7 +3967,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
@@ -3988,7 +3988,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
@@ -4003,7 +4003,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
@@ -4018,7 +4018,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
@@ -4034,7 +4034,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:
@@ -4388,7 +4388,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
@@ -4422,7 +4422,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
@@ -4676,6 +4676,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: b7f0992f3ec8c3f4e07d3b54500225e16bf034ea2757b0652c4ee4daa6f39ab9
hmac: 6b7e722b6b9a9e1df90337a8431ed41fb28d21e6d07c5611cdf1b3eb3125d936
...
+1 -1
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
+1 -1
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
+1 -1
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
+1 -1
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
+1 -1
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
+1 -1
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
+1 -1
View File
@@ -3,7 +3,7 @@
ARG BASE_IMAGE=alpine:3.18.3
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
+1 -1
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)
+1 -1
View File
@@ -82,7 +82,7 @@ require (
github.com/m3db/prometheus_remote_client_golang v0.4.4 // @grafana/backend-platform
github.com/magefile/mage v1.15.0 // @grafana/grafana-release-guild
github.com/mattn/go-isatty v0.0.18 // @grafana/backend-platform
github.com/mattn/go-sqlite3 v1.14.16 // @grafana/backend-platform
github.com/mattn/go-sqlite3 v1.14.19 // @grafana/backend-platform
github.com/matttproud/golang_protobuf_extensions v1.0.4 // @grafana/alerting-squad-backend
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // @grafana/grafana-operator-experience-squad
github.com/opentracing/opentracing-go v1.2.0 // indirect
+2 -2
View File
@@ -2262,8 +2262,8 @@ github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO
github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
github.com/mattn/goveralls v0.0.6 h1:cr8Y0VMo/MnEZBjxNN/vh6G90SZ7IMb6lms1dzMoO+Y=
github.com/mattn/goveralls v0.0.6/go.mod h1:h8b4ow6FxSPMQHF6o2ve3qsclnffZjYTNEKmLesRwqw=
+1 -2
View File
@@ -8,10 +8,9 @@ load(
"nodejs_version",
)
# "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",
+1 -1
View File
@@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.50"
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"