From e07fbeef60b1278add8a97f674b5c72da2365f0c Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Wed, 12 Jul 2023 15:32:40 +0200 Subject: [PATCH] Chore: Upgrade Go to 1.20.6 (#71440) --- .drone.yml | 562 ++++++++++---------- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/pr-codeql-analysis-go.yml | 2 +- .github/workflows/publish-kinds-next.yml | 2 +- .github/workflows/publish-kinds-release.yml | 2 +- .github/workflows/verify-kinds.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/utils/images.star | 4 +- 10 files changed, 291 insertions(+), 291 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9fc47e02033..ed85fc19fde 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -74,13 +74,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build verify-starlark . depends_on: - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-starlark trigger: event: @@ -127,13 +127,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -153,7 +153,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - yarn run ci:test-frontend @@ -162,7 +162,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: event: @@ -216,7 +216,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -225,7 +225,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn run prettier:check @@ -236,7 +236,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-frontend - commands: - |- @@ -250,7 +250,7 @@ steps: - yarn run i18n:compile depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-i18n trigger: event: @@ -304,7 +304,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -315,7 +315,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -325,7 +325,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -334,19 +334,19 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -354,7 +354,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: event: @@ -403,7 +403,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -423,13 +423,13 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - make gen-go depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update && apt-get install make @@ -438,12 +438,12 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.4 + image: golang:1.20.6 name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod failure: ignore - image: golang:1.20.4 + image: golang:1.20.6 name: validate-modfile trigger: event: @@ -499,7 +499,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -508,7 +508,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -516,18 +516,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -550,7 +550,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: trigger-test-release when: branch: main @@ -578,7 +578,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -587,7 +587,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -598,7 +598,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -606,7 +606,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -617,7 +617,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ./scripts/grafana-server/start-server @@ -630,7 +630,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -733,7 +733,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: paths: @@ -744,7 +744,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -895,7 +895,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mkdir -p bin @@ -908,7 +908,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -922,7 +922,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -931,13 +931,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -954,7 +954,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -971,7 +971,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-integration-tests - commands: - apt-get update @@ -988,7 +988,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -998,7 +998,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1008,7 +1008,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: event: @@ -1063,7 +1063,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - |- @@ -1075,7 +1075,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: codespell - commands: - yarn run prettier:checkDocs @@ -1083,7 +1083,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1127,13 +1127,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: shellcheck trigger: event: @@ -1222,14 +1222,14 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1239,7 +1239,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1248,20 +1248,20 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - if [ -z ${GO_PACKAGES} ]; then echo 'missing GO_PACKAGES'; false; fi - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: sqlite-benchmark-integration-tests - commands: - if [ -z ${GO_PACKAGES} ]; then echo 'missing GO_PACKAGES'; false; fi @@ -1272,7 +1272,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-benchmark-integration-tests - commands: - if [ -z ${GO_PACKAGES} ]; then echo 'missing GO_PACKAGES'; false; fi @@ -1282,7 +1282,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-benchmark-integration-tests - commands: - if [ -z ${GO_PACKAGES} ]; then echo 'missing GO_PACKAGES'; false; fi @@ -1292,7 +1292,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1337,7 +1337,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - |- @@ -1349,7 +1349,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: codespell - commands: - yarn run prettier:checkDocs @@ -1357,7 +1357,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1410,13 +1410,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1424,7 +1424,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: branch: main @@ -1464,7 +1464,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn run prettier:check @@ -1474,7 +1474,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-frontend - commands: - |- @@ -1488,7 +1488,7 @@ steps: - yarn run i18n:compile depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-i18n trigger: branch: main @@ -1530,7 +1530,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1539,7 +1539,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1547,19 +1547,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -1567,7 +1567,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: branch: main @@ -1609,12 +1609,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update && apt-get install make @@ -1623,12 +1623,12 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.4 + image: golang:1.20.6 name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod failure: ignore - image: golang:1.20.4 + image: golang:1.20.6 name: validate-modfile - commands: - ./bin/build verify-drone @@ -1682,7 +1682,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1691,7 +1691,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1699,25 +1699,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1726,7 +1726,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1737,7 +1737,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1747,7 +1747,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1765,7 +1765,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ./scripts/grafana-server/start-server @@ -1778,7 +1778,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -1881,7 +1881,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: paths: @@ -1892,7 +1892,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1936,7 +1936,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: publish-frontend-metrics when: repo: @@ -2029,7 +2029,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: release-canary-npm-packages when: paths: @@ -2150,7 +2150,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2163,7 +2163,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2171,13 +2171,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -2194,7 +2194,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -2211,7 +2211,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-integration-tests - commands: - apt-get update @@ -2228,7 +2228,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -2238,7 +2238,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2248,7 +2248,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: branch: main @@ -2477,13 +2477,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.20.4 + image: golang:1.20.6 name: whats-new-checker trigger: event: @@ -2533,32 +2533,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2567,7 +2567,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2576,7 +2576,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2586,7 +2586,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2604,14 +2604,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2650,7 +2650,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -2727,7 +2727,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: event: @@ -2786,7 +2786,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: store-npm-packages trigger: event: @@ -2832,13 +2832,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2846,7 +2846,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: event: @@ -2888,7 +2888,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2897,7 +2897,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2905,19 +2905,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -2925,7 +2925,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: event: @@ -3040,7 +3040,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3057,7 +3057,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3065,19 +3065,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3087,7 +3087,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3096,14 +3096,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3112,7 +3112,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3121,7 +3121,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3131,7 +3131,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -3149,14 +3149,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -3196,7 +3196,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -3331,7 +3331,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3348,7 +3348,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3358,14 +3358,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -3374,7 +3374,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: event: @@ -3414,7 +3414,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mkdir -p bin @@ -3437,7 +3437,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3449,7 +3449,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3459,7 +3459,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3468,19 +3468,19 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -3488,7 +3488,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: event: @@ -3625,7 +3625,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3642,7 +3642,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3650,19 +3650,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3672,7 +3672,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3681,7 +3681,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3690,7 +3690,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3700,14 +3700,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3725,7 +3725,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3745,7 +3745,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3886,7 +3886,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3994,7 +3994,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -4069,7 +4069,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4132,7 +4132,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4196,7 +4196,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise @@ -4247,7 +4247,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}} @@ -4316,7 +4316,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}} @@ -4385,12 +4385,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -4414,7 +4414,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: release-npm-packages trigger: event: @@ -4451,7 +4451,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4542,7 +4542,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4896,32 +4896,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4930,7 +4930,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4941,7 +4941,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4951,7 +4951,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4969,14 +4969,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -5015,7 +5015,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -5092,7 +5092,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: paths: @@ -5176,13 +5176,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5190,7 +5190,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: ref: @@ -5226,7 +5226,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5235,7 +5235,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5243,19 +5243,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -5263,7 +5263,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: ref: @@ -5347,7 +5347,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5355,13 +5355,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -5378,7 +5378,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -5395,7 +5395,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-integration-tests - commands: - apt-get update @@ -5412,7 +5412,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5422,7 +5422,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5432,7 +5432,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: ref: @@ -5540,7 +5540,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5556,7 +5556,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5564,19 +5564,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5586,7 +5586,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5595,14 +5595,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5611,7 +5611,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5622,7 +5622,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5632,7 +5632,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5651,14 +5651,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5698,7 +5698,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -5842,7 +5842,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5858,7 +5858,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5868,14 +5868,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5884,7 +5884,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: ref: @@ -5918,7 +5918,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mkdir -p bin @@ -5940,7 +5940,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5952,7 +5952,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5962,7 +5962,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5971,19 +5971,19 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -5991,7 +5991,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: ref: @@ -6075,7 +6075,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6091,7 +6091,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6101,7 +6101,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6110,13 +6110,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -6133,7 +6133,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -6150,7 +6150,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-integration-tests - commands: - apt-get update @@ -6167,7 +6167,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6177,7 +6177,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6187,7 +6187,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: ref: @@ -6317,7 +6317,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6333,7 +6333,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -6341,19 +6341,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6363,7 +6363,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6372,7 +6372,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6383,7 +6383,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -6393,7 +6393,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6401,7 +6401,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6420,7 +6420,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -6440,7 +6440,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6617,7 +6617,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6625,13 +6625,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -6648,7 +6648,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -6665,7 +6665,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-integration-tests - commands: - apt-get update @@ -6682,7 +6682,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6692,7 +6692,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6702,7 +6702,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: event: @@ -6796,7 +6796,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6813,7 +6813,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6823,7 +6823,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6832,13 +6832,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -6855,7 +6855,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -6872,7 +6872,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-5.7-integration-tests - commands: - apt-get update @@ -6889,7 +6889,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6899,7 +6899,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6909,7 +6909,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: event: @@ -7163,11 +7163,11 @@ platform: steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.4 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.5 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.17.1 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.4 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.6 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39 @@ -7185,11 +7185,11 @@ steps: name: scan-unknown-low-medium-vulnerabilities - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.4 + - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.5 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.17.1 - trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.4 + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.6 - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39 @@ -7232,7 +7232,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -7413,6 +7413,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: 992db6d1af741f53ab58777764b03bf713ae2fc3ad7a3bdf8805d23b9bf2f9eb +hmac: 99d1c7416eed610594287de748406afc9cd73da82fb0f09907401ade2c861f1f ... diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 293bdce11d5..f681447a4b7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.20.4' + go-version: '1.20.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 1e7de9ec121..6f44dbc45ea 100644 --- a/.github/workflows/pr-codeql-analysis-go.yml +++ b/.github/workflows/pr-codeql-analysis-go.yml @@ -23,7 +23,7 @@ jobs: - name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.20.4' + go-version: '1.20.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 7f1bbde3962..041bae2d41b 100644 --- a/.github/workflows/publish-kinds-next.yml +++ b/.github/workflows/publish-kinds-next.yml @@ -20,7 +20,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.20.4' + go-version: '1.20.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 345eae3d44c..309e478f6c0 100644 --- a/.github/workflows/publish-kinds-release.yml +++ b/.github/workflows/publish-kinds-release.yml @@ -22,7 +22,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.20.4' + go-version: '1.20.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 9747c932856..d5424a8f2c7 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.20.4' + go-version: '1.20.6' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/Dockerfile b/Dockerfile index 441be9dfa64..1383a37152a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.17 ARG JS_IMAGE=node:18-alpine3.17 ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.20.4-alpine3.17 +ARG GO_IMAGE=golang:1.20.6-alpine3.17 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index fb74b4f8e4d..7cb2827570b 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. --build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \ --build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg GO_IMAGE=golang:1.20.4 \ + --build-arg GO_IMAGE=golang:1.20.6 \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ $(DOCKER_BUILD_ARGS) diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 992c8d43e9d..3389da58212 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -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.4 \ +ENV GOVERSION=1.20.6 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=18.12.0-1nodesource1 \ diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index 5226779b1ea..7b73849d7d2 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -4,11 +4,11 @@ This module contains all the docker images that are used to build test and publi images = { "cloudsdk_image": "google/cloud-sdk:431.0.0", - "build_image": "grafana/build-container:1.7.4", + "build_image": "grafana/build-container:1.7.5", "publish_image": "grafana/grafana-ci-deploy:1.3.3", "alpine_image": "alpine:3.17.1", "curl_image": "byrnedo/alpine-curl:0.1.8", - "go_image": "golang:1.20.4", + "go_image": "golang:1.20.6", "plugins_slack_image": "plugins/slack", "postgres_alpine_image": "postgres:12.3-alpine", "mysql5_image": "mysql:5.7.39",