From ff88bb0102e491189ef01481bb04268e91e2ca05 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> Date: Thu, 4 May 2023 10:53:16 +0300 Subject: [PATCH] [v9.4.x] Chore: Upgrade Go to 1.20.4 (#67760) Chore: Upgrade Go to 1.20.4 --- .drone.yml | 520 +++++++++++++++--------------- Dockerfile | 2 +- Makefile | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/steps/lib.star | 4 +- 5 files changed, 265 insertions(+), 265 deletions(-) diff --git a/.drone.yml b/.drone.yml index f53e6344c96..22cb8a7d1b6 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: - yarn run ci:test-frontend @@ -141,7 +141,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: @@ -184,7 +184,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 @@ -195,7 +195,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: event: @@ -240,7 +240,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 @@ -249,7 +249,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.' @@ -257,25 +257,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: @@ -324,12 +324,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 @@ -338,7 +338,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.3 + image: golang:1.20.4 name: lint-backend trigger: event: @@ -393,7 +393,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 @@ -402,7 +402,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.' @@ -410,18 +410,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" @@ -444,7 +444,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: @@ -471,7 +471,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} @@ -480,7 +480,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} @@ -489,7 +489,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 @@ -497,7 +497,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 @@ -508,7 +508,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 @@ -521,7 +521,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 @@ -624,7 +624,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: @@ -635,7 +635,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 @@ -724,7 +724,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 @@ -737,7 +737,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.' @@ -745,13 +745,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 @@ -767,7 +767,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 @@ -783,7 +783,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: @@ -835,7 +835,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: - |- @@ -847,7 +847,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 @@ -855,7 +855,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 @@ -899,13 +899,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: @@ -946,7 +946,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: - |- @@ -958,7 +958,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 @@ -966,7 +966,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 @@ -1019,13 +1019,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 @@ -1033,7 +1033,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 @@ -1073,7 +1073,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 @@ -1084,7 +1084,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 @@ -1126,7 +1126,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 @@ -1135,7 +1135,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.' @@ -1143,25 +1143,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 @@ -1203,12 +1203,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 @@ -1217,7 +1217,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 @@ -1271,7 +1271,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 @@ -1280,7 +1280,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.' @@ -1288,25 +1288,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} @@ -1315,7 +1315,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} @@ -1324,7 +1324,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 @@ -1334,7 +1334,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 @@ -1352,7 +1352,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 @@ -1365,7 +1365,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 @@ -1468,7 +1468,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: @@ -1479,7 +1479,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 @@ -1523,7 +1523,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: @@ -1604,7 +1604,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: @@ -1702,7 +1702,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 @@ -1715,7 +1715,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.' @@ -1723,13 +1723,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 @@ -1745,7 +1745,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 @@ -1761,7 +1761,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 @@ -1999,32 +1999,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} @@ -2033,7 +2033,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} @@ -2042,7 +2042,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 @@ -2052,7 +2052,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} @@ -2070,14 +2070,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 @@ -2116,7 +2116,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 @@ -2193,7 +2193,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: @@ -2252,7 +2252,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: @@ -2298,13 +2298,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 @@ -2312,7 +2312,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: @@ -2354,7 +2354,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 @@ -2363,7 +2363,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.' @@ -2371,25 +2371,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: @@ -2505,7 +2505,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/ @@ -2522,7 +2522,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 @@ -2530,19 +2530,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 @@ -2552,7 +2552,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.' @@ -2561,14 +2561,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} @@ -2577,7 +2577,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} @@ -2586,7 +2586,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 @@ -2596,7 +2596,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} @@ -2614,14 +2614,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 @@ -2661,7 +2661,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 @@ -2796,7 +2796,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/ @@ -2813,7 +2813,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 @@ -2823,14 +2823,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 @@ -2839,7 +2839,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: @@ -2879,7 +2879,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 @@ -2902,7 +2902,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 @@ -2914,7 +2914,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 @@ -2924,7 +2924,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.' @@ -2933,25 +2933,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: @@ -3087,7 +3087,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/ @@ -3104,7 +3104,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 @@ -3112,19 +3112,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 @@ -3134,7 +3134,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} @@ -3143,7 +3143,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} @@ -3152,7 +3152,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 @@ -3162,14 +3162,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} @@ -3187,7 +3187,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 @@ -3207,7 +3207,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 @@ -3341,7 +3341,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/ @@ -3358,7 +3358,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 @@ -3366,19 +3366,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 @@ -3388,7 +3388,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} @@ -3397,7 +3397,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} @@ -3406,7 +3406,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 @@ -3416,14 +3416,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} @@ -3441,7 +3441,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 @@ -3461,7 +3461,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 @@ -3587,7 +3587,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 @@ -3683,7 +3683,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 @@ -3762,7 +3762,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 @@ -3831,7 +3831,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 @@ -3894,7 +3894,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 @@ -3958,7 +3958,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 @@ -4009,7 +4009,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} @@ -4071,7 +4071,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} @@ -4144,12 +4144,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} @@ -4173,7 +4173,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: @@ -4210,7 +4210,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 @@ -4301,7 +4301,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 @@ -4397,7 +4397,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/ @@ -4414,7 +4414,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 @@ -4422,7 +4422,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 @@ -4431,7 +4431,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: @@ -4476,32 +4476,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} @@ -4510,7 +4510,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} @@ -4519,7 +4519,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 @@ -4529,7 +4529,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 @@ -4547,14 +4547,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 @@ -4593,7 +4593,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 @@ -4670,7 +4670,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: @@ -4751,13 +4751,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 @@ -4765,7 +4765,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: @@ -4801,7 +4801,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 @@ -4810,7 +4810,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.' @@ -4818,25 +4818,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: @@ -4900,7 +4900,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.' @@ -4908,13 +4908,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 @@ -4930,7 +4930,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 @@ -4946,7 +4946,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: @@ -5052,7 +5052,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/ @@ -5068,7 +5068,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 @@ -5076,19 +5076,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 @@ -5098,7 +5098,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.' @@ -5107,14 +5107,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} @@ -5123,7 +5123,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} @@ -5132,7 +5132,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 @@ -5142,7 +5142,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} @@ -5161,14 +5161,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 @@ -5208,7 +5208,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 @@ -5349,7 +5349,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/ @@ -5365,7 +5365,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 @@ -5375,14 +5375,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 @@ -5391,7 +5391,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: @@ -5425,7 +5425,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 @@ -5447,7 +5447,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 @@ -5459,7 +5459,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 @@ -5469,7 +5469,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.' @@ -5478,25 +5478,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: @@ -5566,7 +5566,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/ @@ -5582,7 +5582,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 @@ -5592,7 +5592,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.' @@ -5601,13 +5601,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 @@ -5623,7 +5623,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 @@ -5639,7 +5639,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 @@ -5650,7 +5650,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 @@ -5661,7 +5661,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: @@ -5787,7 +5787,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/ @@ -5803,7 +5803,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 @@ -5811,19 +5811,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 @@ -5833,7 +5833,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} @@ -5842,7 +5842,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} @@ -5851,7 +5851,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 @@ -5861,7 +5861,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} @@ -5869,7 +5869,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} @@ -5888,7 +5888,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 @@ -5908,7 +5908,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 @@ -6056,7 +6056,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.' @@ -6064,13 +6064,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 @@ -6086,7 +6086,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 @@ -6102,7 +6102,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: @@ -6179,7 +6179,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/ @@ -6196,7 +6196,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 @@ -6206,7 +6206,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.' @@ -6215,13 +6215,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 @@ -6237,7 +6237,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 @@ -6253,7 +6253,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 @@ -6264,7 +6264,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 @@ -6275,7 +6275,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: @@ -6428,7 +6428,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 @@ -6579,6 +6579,6 @@ kind: secret name: enterprise2_security_prefix --- kind: signature -hmac: f8cc6586340900aea3f4b007da26f4995cbbdd662730ed4df44e5f153a1ee7d5 +hmac: 05725748ee28cd69e4b836214a85892ba6174ef196df53232174f3efc6d186a7 ... diff --git a/Dockerfile b/Dockerfile index e72d0bbc52a..f04a02360b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:3.17 ARG JS_IMAGE=node:18-alpine3.17 -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 9b9f0e80c1e..8223a55894b 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,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.3 \ + --build-arg GO_IMAGE=golang:1.20.4 \ --tag grafana/grafana:dev-ubuntu . ##@ Services 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 981037e220e..120110eac45 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": [