From 6761c1de5f4ca617a3abd6a32f30d442d1ee1bc5 Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Fri, 7 Oct 2022 15:03:42 +0200 Subject: [PATCH] Chore: Upgrade Go to 1.19.2 (#56355) (#56552) (cherry picked from commit c2d3a31772d1b9bfff206eac097585d15d7a4cc7) --- .drone.yml | 454 +++++++++++++++--------------- Dockerfile | 2 +- Dockerfile.ubuntu | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/steps/lib.star | 4 +- 5 files changed, 232 insertions(+), 232 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5d57db04d143..5c7e0c4dcb2b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -70,20 +70,20 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - yarn run prettier:check @@ -94,14 +94,14 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-frontend - commands: - yarn betterer ci depends_on: - yarn-install failure: ignore - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -109,7 +109,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-frontend trigger: event: @@ -156,13 +156,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -171,13 +171,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - |- @@ -189,13 +189,13 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: shellcheck - commands: - make lint-go @@ -203,19 +203,19 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-integration trigger: event: @@ -266,13 +266,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -281,19 +281,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - failure: ignore image: grafana/drone-downstream @@ -314,7 +314,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -323,7 +323,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -332,7 +332,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss @@ -340,7 +340,7 @@ steps: - gen-version - yarn-install environment: null - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss @@ -351,7 +351,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package - commands: - ./scripts/grafana-server/start-server @@ -364,7 +364,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: grafana-server - commands: - apt-get install -y netcat @@ -442,14 +442,14 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-storybook - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -533,7 +533,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -546,13 +546,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - apt-get update @@ -568,7 +568,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: postgres-integration-tests - commands: - apt-get update @@ -584,7 +584,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: mysql-integration-tests trigger: event: @@ -639,13 +639,13 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - |- @@ -657,7 +657,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - yarn run prettier:checkDocs @@ -665,7 +665,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-docs - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -674,13 +674,13 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend-packages - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -695,7 +695,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd trigger: event: @@ -738,13 +738,13 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - |- @@ -756,7 +756,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - yarn run prettier:checkDocs @@ -764,7 +764,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-docs - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -773,13 +773,13 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend-packages - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -794,7 +794,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd trigger: branch: main @@ -832,20 +832,20 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - yarn run prettier:check @@ -856,14 +856,14 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-frontend - commands: - yarn betterer ci depends_on: - yarn-install failure: ignore - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -871,7 +871,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-frontend trigger: branch: main @@ -910,13 +910,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -925,13 +925,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - |- @@ -943,13 +943,13 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: shellcheck - commands: - make lint-go @@ -957,19 +957,19 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-integration - commands: - ./bin/grabpl verify-drone @@ -1014,13 +1014,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1029,19 +1029,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -1062,7 +1062,7 @@ steps: from_secret: github_token TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: trigger-test-release when: paths: @@ -1087,7 +1087,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1096,7 +1096,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1105,7 +1105,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss @@ -1115,7 +1115,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-plugins - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1133,7 +1133,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package - commands: - ./scripts/grafana-server/start-server @@ -1146,7 +1146,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: grafana-server - commands: - apt-get install -y netcat @@ -1224,14 +1224,14 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-storybook - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1272,7 +1272,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: publish-frontend-metrics when: repo: @@ -1353,7 +1353,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: release-canary-npm-packages when: repo: @@ -1442,7 +1442,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1455,13 +1455,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - apt-get update @@ -1477,7 +1477,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: postgres-integration-tests - commands: - apt-get update @@ -1493,7 +1493,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: mysql-integration-tests trigger: branch: main @@ -1630,14 +1630,14 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1730,7 +1730,7 @@ steps: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1739,26 +1739,26 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG} @@ -1766,7 +1766,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -1775,7 +1775,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -1784,7 +1784,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss @@ -1794,7 +1794,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-plugins - commands: - ./bin/grabpl package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -1812,14 +1812,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition oss --shouldSave @@ -1856,7 +1856,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: grafana-server - commands: - apt-get install -y netcat @@ -1934,7 +1934,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss @@ -2037,7 +2037,7 @@ steps: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2046,32 +2046,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: shellcheck - commands: - |- @@ -2083,7 +2083,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - make lint-go @@ -2091,7 +2091,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend - commands: - yarn run prettier:check @@ -2102,19 +2102,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-frontend - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2122,7 +2122,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-frontend trigger: event: @@ -2188,13 +2188,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - apt-get update @@ -2210,7 +2210,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: postgres-integration-tests - commands: - apt-get update @@ -2226,7 +2226,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: mysql-integration-tests trigger: event: @@ -2343,7 +2343,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2359,7 +2359,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2367,25 +2367,25 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2395,7 +2395,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2403,7 +2403,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2412,7 +2412,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2421,7 +2421,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise @@ -2431,7 +2431,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} @@ -2439,7 +2439,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2458,14 +2458,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition enterprise --shouldSave @@ -2503,7 +2503,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: grafana-server - commands: - apt-get install -y netcat @@ -2623,7 +2623,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 @@ -2699,7 +2699,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2715,7 +2715,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2723,25 +2723,25 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2751,7 +2751,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - |- @@ -2763,7 +2763,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - make lint-go @@ -2771,7 +2771,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend - commands: - yarn run prettier:check @@ -2782,19 +2782,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-frontend - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2802,7 +2802,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-frontend - commands: - make lint-go @@ -2810,13 +2810,13 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend-enterprise2 - commands: - go test -tags=pro -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-enterprise2 trigger: event: @@ -2890,7 +2890,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2906,7 +2906,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2916,13 +2916,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - apt-get update @@ -2938,7 +2938,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: postgres-integration-tests - commands: - apt-get update @@ -2954,7 +2954,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -2963,7 +2963,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2972,7 +2972,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: memcached-integration-tests trigger: event: @@ -3470,7 +3470,7 @@ steps: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - ./bin/grabpl artifacts npm retrieve --tag v${TAG} @@ -3492,7 +3492,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: release-npm-packages trigger: event: @@ -3530,7 +3530,7 @@ steps: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - ./bin/grabpl store-packages --edition oss --packages-bucket grafana-downloads @@ -3608,7 +3608,7 @@ steps: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - ./bin/grabpl store-packages --edition enterprise --packages-bucket grafana-downloads @@ -3686,7 +3686,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: artifacts-page trigger: event: @@ -3724,7 +3724,7 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3733,26 +3733,26 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3760,7 +3760,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3769,7 +3769,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3778,7 +3778,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss @@ -3788,7 +3788,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-plugins - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -3806,14 +3806,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition oss --shouldSave @@ -3850,7 +3850,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: grafana-server - commands: - apt-get install -y netcat @@ -3928,7 +3928,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss @@ -4002,7 +4002,7 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4011,32 +4011,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: shellcheck - commands: - |- @@ -4048,7 +4048,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - make lint-go @@ -4056,7 +4056,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend - commands: - yarn run prettier:check @@ -4067,19 +4067,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-frontend - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -4087,7 +4087,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-frontend trigger: ref: @@ -4147,13 +4147,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - apt-get update @@ -4169,7 +4169,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: postgres-integration-tests - commands: - apt-get update @@ -4185,7 +4185,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: mysql-integration-tests trigger: ref: @@ -4285,7 +4285,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4298,7 +4298,7 @@ steps: depends_on: - clone-enterprise environment: {} - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4306,25 +4306,25 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4334,7 +4334,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4342,7 +4342,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4351,7 +4351,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise --build-id @@ -4361,7 +4361,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise @@ -4371,7 +4371,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -4380,7 +4380,7 @@ steps: - gen-version - wire-install - compile-build-cmd - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4400,14 +4400,14 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition enterprise --shouldSave @@ -4445,7 +4445,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: grafana-server - commands: - apt-get install -y netcat @@ -4561,7 +4561,7 @@ steps: from_secret: gpg_pub_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 @@ -4631,7 +4631,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4644,7 +4644,7 @@ steps: depends_on: - clone-enterprise environment: {} - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4652,25 +4652,25 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.1 + image: golang:1.19.2 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: yarn-install - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: gen-version - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4680,7 +4680,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - |- @@ -4692,7 +4692,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: codespell - commands: - make lint-go @@ -4700,7 +4700,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend - commands: - yarn run prettier:check @@ -4711,19 +4711,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-frontend - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -4731,7 +4731,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-frontend - commands: - make lint-go @@ -4739,13 +4739,13 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: lint-backend-enterprise2 - commands: - go test -tags=pro -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: test-backend-enterprise2 trigger: ref: @@ -4813,7 +4813,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4826,7 +4826,7 @@ steps: depends_on: - clone-enterprise environment: {} - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4836,13 +4836,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: wire-install - commands: - apt-get update @@ -4858,7 +4858,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: postgres-integration-tests - commands: - apt-get update @@ -4874,7 +4874,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -4883,7 +4883,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4892,7 +4892,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.2 + image: grafana/build-container:1.6.3 name: memcached-integration-tests trigger: ref: @@ -5164,6 +5164,6 @@ kind: secret name: packages_secret_access_key --- kind: signature -hmac: 1589abf9aa24456fc7c990e0da911821417e64c25a3fa983063904e3336c31d0 +hmac: c2315645dc460a0b74775ef8f1f6f124daf43d073f4efa496a4c08399756327f ... diff --git a/Dockerfile b/Dockerfile index 1d280a079328..7a137dfd4418 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.19.1-alpine3.15 as go-builder +FROM golang:1.19.2-alpine3.15 as go-builder RUN apk add --no-cache gcc g++ make diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 3364ef29aad0..c66e49132961 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -21,7 +21,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.19.1 AS go-builder +FROM golang:1.19.2 AS go-builder WORKDIR /src/grafana diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 69628a2ca2e9..3c389d94360f 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -102,7 +102,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's. FROM debian:buster-20220822 -ENV GOVERSION=1.19.1 \ +ENV GOVERSION=1.19.2 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=16.14.0-1nodesource1 \ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index dd39ec94773f..03bcd80dbc56 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1,14 +1,14 @@ load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') grabpl_version = 'v2.9.54-v9.1.x' -build_image = 'grafana/build-container:1.6.2' +build_image = 'grafana/build-container:1.6.3' publish_image = 'grafana/grafana-ci-deploy:1.3.3' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' alpine_image = 'alpine:3.15.6' 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.19.1' +go_image = 'golang:1.19.2' disable_tests = False trigger_oss = {