From 20a265efe99a8e8cbdfb05bfa06d0915b5103709 Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Wed, 19 Apr 2023 14:03:58 +0200 Subject: [PATCH] Chore: Upgrade Go to 1.20.3 (#66844) Backport of #66264 --- .drone.yml | 498 +++++++++++++++--------------- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/steps/lib.star | 4 +- 5 files changed, 254 insertions(+), 254 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8c10d3e0f17..dad0f57f1dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -74,13 +74,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build verify-starlark . depends_on: - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-starlark trigger: event: @@ -127,13 +127,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: event: @@ -216,7 +216,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn run prettier:check @@ -237,7 +237,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-frontend trigger: event: @@ -291,7 +291,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -302,7 +302,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -312,25 +312,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: event: @@ -379,7 +379,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -399,13 +399,13 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - make gen-go depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update && apt-get install make @@ -414,7 +414,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.1 + image: golang:1.20.3 name: lint-backend trigger: event: @@ -469,7 +469,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -478,18 +478,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -512,7 +512,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: trigger-test-release when: paths: @@ -539,7 +539,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -548,7 +548,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -557,7 +557,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -565,7 +565,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -576,7 +576,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ./scripts/grafana-server/start-server @@ -589,7 +589,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -692,7 +692,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: paths: @@ -703,7 +703,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -799,7 +799,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mkdir -p bin @@ -812,7 +812,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -826,13 +826,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -848,7 +848,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -864,7 +864,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests trigger: event: @@ -916,7 +916,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - |- @@ -928,7 +928,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.2 + image: grafana/build-container:1.7.3 name: codespell - commands: - yarn run prettier:checkDocs @@ -936,7 +936,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -980,13 +980,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: shellcheck trigger: event: @@ -1027,7 +1027,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - |- @@ -1039,7 +1039,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.2 + image: grafana/build-container:1.7.3 name: codespell - commands: - yarn run prettier:checkDocs @@ -1047,7 +1047,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -1100,13 +1100,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1114,7 +1114,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: branch: main @@ -1154,7 +1154,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn run prettier:check @@ -1165,7 +1165,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: lint-frontend trigger: branch: main @@ -1207,7 +1207,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1216,25 +1216,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: branch: main @@ -1276,12 +1276,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update && apt-get install make @@ -1290,7 +1290,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.1 + image: golang:1.20.3 name: lint-backend - commands: - ./bin/build verify-drone @@ -1344,7 +1344,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1353,25 +1353,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1380,7 +1380,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1389,7 +1389,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1399,7 +1399,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1417,7 +1417,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ./scripts/grafana-server/start-server @@ -1430,7 +1430,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -1533,7 +1533,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: paths: @@ -1544,7 +1544,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1588,7 +1588,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: publish-frontend-metrics when: repo: @@ -1669,7 +1669,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: release-canary-npm-packages when: repo: @@ -1767,7 +1767,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1780,13 +1780,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -1802,7 +1802,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -1818,7 +1818,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests trigger: branch: main @@ -2056,32 +2056,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.1 + image: golang:1.20.3 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.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2090,7 +2090,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2099,7 +2099,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2109,7 +2109,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2127,14 +2127,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2173,7 +2173,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -2250,7 +2250,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: event: @@ -2309,7 +2309,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: store-npm-packages trigger: event: @@ -2355,13 +2355,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2369,7 +2369,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: event: @@ -2411,7 +2411,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2420,25 +2420,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: event: @@ -2554,7 +2554,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2571,7 +2571,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2579,19 +2579,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2601,14 +2601,14 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2617,7 +2617,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2626,7 +2626,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2636,7 +2636,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2654,14 +2654,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2701,7 +2701,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -2836,7 +2836,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2853,7 +2853,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2863,14 +2863,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2879,7 +2879,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: event: @@ -2919,7 +2919,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mkdir -p bin @@ -2942,7 +2942,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2954,7 +2954,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2964,25 +2964,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: event: @@ -3118,7 +3118,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3135,7 +3135,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3143,19 +3143,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3165,7 +3165,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3174,7 +3174,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3183,7 +3183,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3193,14 +3193,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3218,7 +3218,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3238,7 +3238,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3372,7 +3372,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3389,7 +3389,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3397,19 +3397,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3419,7 +3419,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3428,7 +3428,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3437,7 +3437,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3447,14 +3447,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3472,7 +3472,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3492,7 +3492,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3618,7 +3618,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3714,7 +3714,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3793,7 +3793,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3862,7 +3862,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -3925,7 +3925,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -3989,7 +3989,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise @@ -4040,7 +4040,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts packages --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -4102,7 +4102,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -4175,12 +4175,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -4204,7 +4204,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: release-npm-packages trigger: event: @@ -4241,7 +4241,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4332,7 +4332,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4428,7 +4428,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4445,7 +4445,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4453,7 +4453,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build artifacts-page @@ -4462,7 +4462,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: artifacts-page trigger: event: @@ -4507,32 +4507,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.1 + image: golang:1.20.3 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.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4541,7 +4541,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4550,7 +4550,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4560,7 +4560,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4578,14 +4578,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4624,7 +4624,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -4701,7 +4701,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-storybook when: paths: @@ -4782,13 +4782,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4796,7 +4796,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: ref: @@ -4832,7 +4832,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4841,25 +4841,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: ref: @@ -4923,13 +4923,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -4945,7 +4945,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -4961,7 +4961,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests trigger: ref: @@ -5067,7 +5067,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5083,7 +5083,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5091,19 +5091,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5113,14 +5113,14 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - 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.2 + image: grafana/build-container:1.7.3 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5129,7 +5129,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5138,7 +5138,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5148,7 +5148,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5167,14 +5167,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5214,7 +5214,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: grafana-server - commands: - apt-get install -y netcat @@ -5355,7 +5355,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5371,7 +5371,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5381,14 +5381,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5397,7 +5397,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-frontend trigger: ref: @@ -5431,7 +5431,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mkdir -p bin @@ -5453,7 +5453,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5465,7 +5465,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5475,25 +5475,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 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.2 + image: grafana/build-container:1.7.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: test-backend-integration trigger: ref: @@ -5563,7 +5563,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5579,7 +5579,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5589,13 +5589,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -5611,7 +5611,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -5627,7 +5627,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5638,7 +5638,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5649,7 +5649,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: ref: @@ -5775,7 +5775,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5791,7 +5791,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5799,19 +5799,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5821,7 +5821,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5830,7 +5830,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5839,7 +5839,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5849,7 +5849,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -5857,7 +5857,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -5876,7 +5876,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -5896,7 +5896,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6044,13 +6044,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -6066,7 +6066,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -6082,7 +6082,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests trigger: event: @@ -6159,7 +6159,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6176,7 +6176,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6186,13 +6186,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: wire-install - commands: - apt-get update @@ -6208,7 +6208,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: postgres-integration-tests - commands: - apt-get update @@ -6224,7 +6224,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6235,7 +6235,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6246,7 +6246,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.2 + image: grafana/build-container:1.7.3 name: memcached-integration-tests trigger: event: @@ -6399,7 +6399,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.1 + image: golang:1.20.3 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -6550,6 +6550,6 @@ kind: secret name: enterprise2_security_prefix --- kind: signature -hmac: 15fc4331f320c448618fe5180ead12512088c65bd0cd38d80303990b797cbd78 +hmac: 5da67ee485955b97d3f6d1303f0024cc292f9b32c32deca2fd5c91504691c8b0 ... diff --git a/Dockerfile b/Dockerfile index 1c3c38653cd..af647593a2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:3.17 ARG JS_IMAGE=node:16-alpine3.17 -ARG GO_IMAGE=golang:1.20.1-alpine3.17 +ARG GO_IMAGE=golang:1.20.3-alpine3.17 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index 24100ca7bf9..cc72b21dff7 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. DOCKER_BUILDKIT=1 \ docker build \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg GO_IMAGE=golang:1.20.1 \ + --build-arg GO_IMAGE=golang:1.20.3 \ --tag grafana/grafana:dev-ubuntu . ##@ Services diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index e32e19b6db8..839f453af11 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -102,7 +102,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.1 \ +ENV GOVERSION=1.20.3 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=16.14.0-1nodesource1 \ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 4319f1e3ffd..b4358803b06 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -9,14 +9,14 @@ load( ) grabpl_version = "v3.0.30" -build_image = "grafana/build-container:1.7.2" +build_image = "grafana/build-container:1.7.3" publish_image = "grafana/grafana-ci-deploy:1.3.3" deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image" alpine_image = "alpine:3.17.1" curl_image = "byrnedo/alpine-curl:0.1.8" windows_image = "mcr.microsoft.com/windows:1809" wix_image = "grafana/ci-wix:0.1.1" -go_image = "golang:1.20.1" +go_image = "golang:1.20.3" trigger_oss = { "repo": [