diff --git a/.drone.yml b/.drone.yml index b640eb840d8..737398cc9b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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: @@ -322,7 +322,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.' @@ -331,21 +331,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 @@ -354,7 +354,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: @@ -405,7 +405,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 @@ -432,7 +432,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 @@ -441,16 +441,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: @@ -507,7 +507,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 @@ -517,7 +517,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.' @@ -526,14 +526,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 @@ -566,7 +566,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 @@ -852,7 +852,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 @@ -866,7 +866,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.' @@ -875,14 +875,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 @@ -903,7 +903,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 @@ -924,7 +924,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 @@ -945,7 +945,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 @@ -960,7 +960,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 @@ -975,7 +975,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 @@ -991,7 +991,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: @@ -1079,7 +1079,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: @@ -1120,7 +1120,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 @@ -1188,7 +1188,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: @@ -1290,7 +1290,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 @@ -1301,7 +1301,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.' @@ -1311,14 +1311,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 @@ -1326,7 +1326,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 @@ -1338,7 +1338,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 @@ -1349,7 +1349,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 @@ -1360,7 +1360,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: @@ -1438,7 +1438,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 @@ -1614,7 +1614,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.' @@ -1623,21 +1623,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 @@ -1646,7 +1646,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 @@ -1691,13 +1691,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 @@ -1706,16 +1706,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 @@ -1772,7 +1772,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 @@ -1782,7 +1782,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.' @@ -1791,14 +1791,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 @@ -1830,7 +1830,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 @@ -2214,7 +2214,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 @@ -2228,7 +2228,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.' @@ -2237,14 +2237,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 @@ -2265,7 +2265,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 @@ -2286,7 +2286,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 @@ -2307,7 +2307,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 @@ -2322,7 +2322,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 @@ -2337,7 +2337,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 @@ -2353,7 +2353,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 @@ -2546,7 +2546,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 @@ -2643,7 +2643,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} @@ -2713,7 +2713,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 @@ -2779,7 +2779,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 @@ -2886,7 +2886,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: @@ -2944,13 +2944,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: @@ -3052,7 +3052,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.' @@ -3061,21 +3061,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 @@ -3084,7 +3084,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: @@ -3141,7 +3141,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: @@ -3324,7 +3324,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: @@ -3473,7 +3473,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.' @@ -3482,21 +3482,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 @@ -3505,7 +3505,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: @@ -3560,7 +3560,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: @@ -3707,7 +3707,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: @@ -3816,7 +3816,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: @@ -3906,20 +3906,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: @@ -4012,7 +4012,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.' @@ -4021,14 +4021,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 @@ -4049,7 +4049,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 @@ -4070,7 +4070,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 @@ -4091,7 +4091,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 @@ -4106,7 +4106,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 @@ -4121,7 +4121,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 @@ -4137,7 +4137,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: @@ -4491,7 +4491,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 @@ -4525,7 +4525,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 @@ -4779,6 +4779,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: e3ab1ec1c6d9e85f235c0d662808509453e3efa9431da4de420098d1f4e536cc +hmac: 51ad95c27b1414d9e4acd0b920a3e9ceab5ccb2ef8df60fc43eb90c70cdf34d5 ... diff --git a/.github/workflows/alerting-swagger-gen.yml b/.github/workflows/alerting-swagger-gen.yml index 54b984bb563..a9abc4f5782 100644 --- a/.github/workflows/alerting-swagger-gen.yml +++ b/.github/workflows/alerting-swagger-gen.yml @@ -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 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a6bfe311ef8..455633da8ec 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 diff --git a/.github/workflows/pr-codeql-analysis-go.yml b/.github/workflows/pr-codeql-analysis-go.yml index c47c19a09a8..e7fad07382d 100644 --- a/.github/workflows/pr-codeql-analysis-go.yml +++ b/.github/workflows/pr-codeql-analysis-go.yml @@ -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 diff --git a/.github/workflows/publish-kinds-next.yml b/.github/workflows/publish-kinds-next.yml index ec88f288df7..618411fd088 100644 --- a/.github/workflows/publish-kinds-next.yml +++ b/.github/workflows/publish-kinds-next.yml @@ -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 diff --git a/.github/workflows/publish-kinds-release.yml b/.github/workflows/publish-kinds-release.yml index 5e32b09d408..0a2a013737a 100644 --- a/.github/workflows/publish-kinds-release.yml +++ b/.github/workflows/publish-kinds-release.yml @@ -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 diff --git a/.github/workflows/verify-kinds.yml b/.github/workflows/verify-kinds.yml index cda6ccbc679..9107bed450a 100644 --- a/.github/workflows/verify-kinds.yml +++ b/.github/workflows/verify-kinds.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index 425a675ef48..9f41c4c048e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index 4c6a646c882..d335f8fad4c 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/go.mod b/go.mod index 341ca36129f..f323bbb4935 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( github.com/m3db/prometheus_remote_client_golang v0.4.4 // @grafana/backend-platform github.com/magefile/mage v1.15.0 // @grafana/grafana-delivery 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 diff --git a/go.sum b/go.sum index cfc54ff08d5..5263e6d0c86 100644 --- a/go.sum +++ b/go.sum @@ -2283,8 +2283,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= diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index 92162ffbfa4..59068896df3 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -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", diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 7d79a1171ff..51b8bb45a20 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -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"