From cfcea7591663053d58f0783e84a356eb258444cb Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> Date: Thu, 4 May 2023 10:52:36 +0300 Subject: [PATCH] [v9.5.x] Chore: Upgrade Go to 1.20.4 (#67757) Chore: Upgrade Go to 1.20.4 --- .drone.yml | 530 +++++++++++++++--------------- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/steps/lib.star | 4 +- 5 files changed, 270 insertions(+), 270 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3702849e91a..bffe67046e7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -74,13 +74,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build verify-starlark . depends_on: - compile-build-cmd - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: lint-starlark trigger: event: @@ -127,13 +127,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-frontend trigger: event: @@ -216,7 +216,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: lint-frontend trigger: event: @@ -291,7 +291,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -302,7 +302,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -312,7 +312,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -321,25 +321,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-backend-integration trigger: event: @@ -388,7 +388,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -408,13 +408,13 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - make gen-go depends_on: - clone-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update && apt-get install make @@ -423,7 +423,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.3 + image: golang:1.20.4 name: lint-backend trigger: event: @@ -478,7 +478,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -487,7 +487,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -495,18 +495,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -529,7 +529,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: trigger-test-release when: paths: @@ -556,7 +556,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -565,7 +565,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -574,7 +574,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -582,7 +582,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -593,7 +593,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package - commands: - ./scripts/grafana-server/start-server @@ -606,7 +606,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: grafana-server - commands: - apt-get install -y netcat @@ -709,7 +709,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-storybook when: paths: @@ -720,7 +720,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -816,7 +816,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mkdir -p bin @@ -829,7 +829,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -843,7 +843,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -852,13 +852,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update @@ -874,7 +874,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: postgres-integration-tests - commands: - apt-get update @@ -890,7 +890,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: mysql-integration-tests trigger: event: @@ -942,7 +942,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - |- @@ -954,7 +954,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.3 + image: grafana/build-container:1.7.4 name: codespell - commands: - yarn run prettier:checkDocs @@ -962,7 +962,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1006,13 +1006,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: shellcheck trigger: event: @@ -1053,7 +1053,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - |- @@ -1065,7 +1065,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.3 + image: grafana/build-container:1.7.4 name: codespell - commands: - yarn run prettier:checkDocs @@ -1073,7 +1073,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1126,13 +1126,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1140,7 +1140,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-frontend trigger: branch: main @@ -1180,7 +1180,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn run prettier:check @@ -1191,7 +1191,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: lint-frontend trigger: branch: main @@ -1233,7 +1233,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1242,7 +1242,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1250,25 +1250,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-backend-integration trigger: branch: main @@ -1310,12 +1310,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update && apt-get install make @@ -1324,7 +1324,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.3 + image: golang:1.20.4 name: lint-backend - commands: - ./bin/build verify-drone @@ -1378,7 +1378,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1387,7 +1387,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1395,25 +1395,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1422,7 +1422,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1431,7 +1431,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1441,7 +1441,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1459,7 +1459,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package - commands: - ./scripts/grafana-server/start-server @@ -1472,7 +1472,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: grafana-server - commands: - apt-get install -y netcat @@ -1575,7 +1575,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-storybook when: paths: @@ -1586,7 +1586,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1630,7 +1630,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: publish-frontend-metrics when: repo: @@ -1711,7 +1711,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: release-canary-npm-packages when: repo: @@ -1809,7 +1809,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1822,7 +1822,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1830,13 +1830,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update @@ -1852,7 +1852,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: postgres-integration-tests - commands: - apt-get update @@ -1868,7 +1868,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: mysql-integration-tests trigger: branch: main @@ -2106,32 +2106,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: golang:1.20.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2140,7 +2140,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2149,7 +2149,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2159,7 +2159,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2177,14 +2177,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2223,7 +2223,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: grafana-server - commands: - apt-get install -y netcat @@ -2300,7 +2300,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-storybook when: event: @@ -2359,7 +2359,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: store-npm-packages trigger: event: @@ -2405,13 +2405,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2419,7 +2419,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-frontend trigger: event: @@ -2461,7 +2461,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2470,7 +2470,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2478,25 +2478,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-backend-integration trigger: event: @@ -2612,7 +2612,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2629,7 +2629,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2637,19 +2637,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2659,7 +2659,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2668,14 +2668,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2684,7 +2684,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2693,7 +2693,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2703,7 +2703,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2721,14 +2721,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2768,7 +2768,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: grafana-server - commands: - apt-get install -y netcat @@ -2903,7 +2903,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2920,7 +2920,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2930,14 +2930,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2946,7 +2946,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-frontend trigger: event: @@ -2986,7 +2986,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mkdir -p bin @@ -3009,7 +3009,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3021,7 +3021,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3031,7 +3031,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3040,25 +3040,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-backend-integration trigger: event: @@ -3194,7 +3194,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3211,7 +3211,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3219,19 +3219,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3241,7 +3241,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3250,7 +3250,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3259,7 +3259,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3269,14 +3269,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3294,7 +3294,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3314,7 +3314,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3448,7 +3448,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3465,7 +3465,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3473,19 +3473,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3495,7 +3495,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3504,7 +3504,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3513,7 +3513,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3523,14 +3523,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3548,7 +3548,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3568,7 +3568,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3694,7 +3694,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3790,7 +3790,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3869,7 +3869,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3938,7 +3938,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4001,7 +4001,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -4065,7 +4065,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise @@ -4116,7 +4116,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts packages --security --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -4178,7 +4178,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -4251,12 +4251,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -4280,7 +4280,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: release-npm-packages trigger: event: @@ -4317,7 +4317,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4408,7 +4408,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4504,7 +4504,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4521,7 +4521,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4529,7 +4529,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build artifacts-page @@ -4538,7 +4538,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: artifacts-page trigger: event: @@ -4583,32 +4583,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: golang:1.20.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4617,7 +4617,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4626,7 +4626,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4636,7 +4636,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4654,14 +4654,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4700,7 +4700,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: grafana-server - commands: - apt-get install -y netcat @@ -4777,7 +4777,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-storybook when: paths: @@ -4858,13 +4858,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4872,7 +4872,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-frontend trigger: ref: @@ -4908,7 +4908,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4917,7 +4917,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4925,25 +4925,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-backend-integration trigger: ref: @@ -5007,7 +5007,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5015,13 +5015,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update @@ -5037,7 +5037,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: postgres-integration-tests - commands: - apt-get update @@ -5053,7 +5053,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: mysql-integration-tests trigger: ref: @@ -5159,7 +5159,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5175,7 +5175,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5183,19 +5183,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5205,7 +5205,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5214,14 +5214,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5230,7 +5230,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5239,7 +5239,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5249,7 +5249,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5268,14 +5268,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5315,7 +5315,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: grafana-server - commands: - apt-get install -y netcat @@ -5456,7 +5456,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5472,7 +5472,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5482,14 +5482,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5498,7 +5498,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-frontend trigger: ref: @@ -5532,7 +5532,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mkdir -p bin @@ -5554,7 +5554,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5566,7 +5566,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5576,7 +5576,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5585,25 +5585,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 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.3 + image: grafana/build-container:1.7.4 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: test-backend-integration trigger: ref: @@ -5673,7 +5673,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5689,7 +5689,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5699,7 +5699,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5708,13 +5708,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update @@ -5730,7 +5730,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: postgres-integration-tests - commands: - apt-get update @@ -5746,7 +5746,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5757,7 +5757,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5768,7 +5768,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: memcached-integration-tests trigger: ref: @@ -5894,7 +5894,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5910,7 +5910,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5918,19 +5918,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5940,7 +5940,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5949,7 +5949,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5958,7 +5958,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5968,7 +5968,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -5976,7 +5976,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -5995,7 +5995,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -6015,7 +6015,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6163,7 +6163,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6171,13 +6171,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update @@ -6193,7 +6193,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: postgres-integration-tests - commands: - apt-get update @@ -6209,7 +6209,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: mysql-integration-tests trigger: event: @@ -6286,7 +6286,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6303,7 +6303,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6313,7 +6313,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6322,13 +6322,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: wire-install - commands: - apt-get update @@ -6344,7 +6344,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: postgres-integration-tests - commands: - apt-get update @@ -6360,7 +6360,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6371,7 +6371,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6382,7 +6382,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.3 + image: grafana/build-container:1.7.4 name: memcached-integration-tests trigger: event: @@ -6535,7 +6535,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.3 + image: golang:1.20.4 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -6686,6 +6686,6 @@ kind: secret name: enterprise2_security_prefix --- kind: signature -hmac: 1d5758f658fda274a4596b1897766ea87def1956ee2b8aaf65036af66a30e822 +hmac: 32319c5e2f351287cc8e98af442d77b011d47749c018838928466020b64860c0 ... diff --git a/Dockerfile b/Dockerfile index 3d4f4dbdbe8..441be9dfa64 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.3-alpine3.17 +ARG GO_IMAGE=golang:1.20.4-alpine3.17 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index b2475cce9ae..a06ae9bfed6 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,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.3 \ + --build-arg GO_IMAGE=golang:1.20.4 \ --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 9d3a65b388a..992c8d43e9d 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.3 \ +ENV GOVERSION=1.20.4 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=18.12.0-1nodesource1 \ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 03d73d43283..b5e0e5a0b52 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.3" +build_image = "grafana/build-container:1.7.4" 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.3" +go_image = "golang:1.20.4" trigger_oss = { "repo": [