From 64352e8d0851e4ba0c68903f08708bf8d3b99bef Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Thu, 26 Jan 2023 10:19:39 +0000 Subject: [PATCH] Chore: Move to node 18 again (#62079) move to node 18 again --- .betterer.results | 3 +- .drone.yml | 440 +++++++++--------- .nvmrc | 2 +- Dockerfile | 2 +- contribute/developer-guide.md | 2 +- package.json | 2 +- .../grafana-ui/src/slate-plugins/braces.ts | 2 +- .../SharePublicDashboard.test.tsx | 3 +- scripts/build/ci-build/Dockerfile | 4 +- scripts/build/ci-build/README.md | 2 + scripts/drone/steps/lib.star | 2 +- 11 files changed, 233 insertions(+), 231 deletions(-) diff --git a/.betterer.results b/.betterer.results index 536fe3b854c..84e8e04d72f 100644 --- a/.betterer.results +++ b/.betterer.results @@ -1622,8 +1622,7 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "packages/grafana-ui/src/slate-plugins/braces.ts:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"] + [0, 0, 0, "Do not use any type assertions.", "0"] ], "packages/grafana-ui/src/slate-plugins/slate-prism/index.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], diff --git a/.drone.yml b/.drone.yml index bbc16269349..e787f4007f8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,13 +84,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -98,7 +98,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-frontend trigger: event: @@ -141,7 +141,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn run prettier:check @@ -152,7 +152,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: lint-frontend trigger: event: @@ -206,7 +206,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -214,25 +214,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend-integration trigger: event: @@ -286,7 +286,7 @@ steps: - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update && apt-get install make @@ -359,7 +359,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -367,18 +367,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -403,7 +403,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: trigger-test-release when: paths: @@ -430,7 +430,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -439,7 +439,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -448,7 +448,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -456,7 +456,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -467,7 +467,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package - commands: - ./scripts/grafana-server/start-server @@ -480,7 +480,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: grafana-server - commands: - apt-get install -y netcat @@ -583,7 +583,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-storybook when: paths: @@ -594,7 +594,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -696,7 +696,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -704,13 +704,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update @@ -726,7 +726,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: postgres-integration-tests - commands: - apt-get update @@ -742,7 +742,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: mysql-integration-tests trigger: event: @@ -800,7 +800,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - |- @@ -812,7 +812,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.6 + image: grafana/build-container:1.6.7 name: codespell - commands: - yarn run prettier:checkDocs @@ -820,7 +820,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -870,7 +870,7 @@ steps: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: shellcheck trigger: event: @@ -917,7 +917,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - |- @@ -929,7 +929,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.6 + image: grafana/build-container:1.6.7 name: codespell - commands: - yarn run prettier:checkDocs @@ -937,7 +937,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -990,13 +990,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1004,7 +1004,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-frontend trigger: branch: main @@ -1044,7 +1044,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn run prettier:check @@ -1055,7 +1055,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: lint-frontend trigger: branch: main @@ -1106,7 +1106,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1114,25 +1114,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend-integration trigger: branch: main @@ -1179,7 +1179,7 @@ steps: - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update && apt-get install make @@ -1251,7 +1251,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1259,25 +1259,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 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.6.6 + image: grafana/build-container:1.6.7 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1286,7 +1286,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1295,7 +1295,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1305,7 +1305,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1323,7 +1323,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package - commands: - ./scripts/grafana-server/start-server @@ -1336,7 +1336,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: grafana-server - commands: - apt-get install -y netcat @@ -1439,7 +1439,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-storybook when: paths: @@ -1450,7 +1450,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1494,7 +1494,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: publish-frontend-metrics when: repo: @@ -1575,7 +1575,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: release-canary-npm-packages when: repo: @@ -1686,7 +1686,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1694,13 +1694,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update @@ -1716,7 +1716,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: postgres-integration-tests - commands: - apt-get update @@ -1732,7 +1732,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: mysql-integration-tests trigger: branch: main @@ -1970,18 +1970,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -1995,7 +1995,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2004,7 +2004,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2013,7 +2013,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2023,7 +2023,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2041,14 +2041,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2087,7 +2087,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: grafana-server - commands: - apt-get install -y netcat @@ -2164,7 +2164,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-storybook when: event: @@ -2223,7 +2223,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: store-npm-packages trigger: event: @@ -2272,13 +2272,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2286,7 +2286,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-frontend trigger: event: @@ -2334,7 +2334,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2342,25 +2342,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend-integration trigger: event: @@ -2427,7 +2427,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2435,13 +2435,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update @@ -2457,7 +2457,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: postgres-integration-tests - commands: - apt-get update @@ -2473,7 +2473,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: mysql-integration-tests trigger: event: @@ -2590,7 +2590,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2606,7 +2606,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2620,13 +2620,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2636,7 +2636,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2645,14 +2645,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 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.6.6 + image: grafana/build-container:1.6.7 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2661,7 +2661,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2670,7 +2670,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2680,7 +2680,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2698,14 +2698,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2745,7 +2745,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: grafana-server - commands: - apt-get install -y netcat @@ -2877,7 +2877,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2893,7 +2893,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2909,14 +2909,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2925,7 +2925,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-frontend trigger: event: @@ -2962,7 +2962,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mkdir -p bin @@ -2984,7 +2984,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3006,7 +3006,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3015,25 +3015,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend-integration trigger: event: @@ -3106,7 +3106,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3122,7 +3122,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3132,7 +3132,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3141,13 +3141,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update @@ -3163,7 +3163,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: postgres-integration-tests - commands: - apt-get update @@ -3179,7 +3179,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -3190,7 +3190,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3201,7 +3201,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: memcached-integration-tests trigger: event: @@ -3338,7 +3338,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3354,7 +3354,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3368,13 +3368,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3384,7 +3384,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3393,7 +3393,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3402,7 +3402,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3412,14 +3412,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 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.6.6 + image: grafana/build-container:1.6.7 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3437,7 +3437,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3457,7 +3457,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3588,7 +3588,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3604,7 +3604,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3618,13 +3618,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3634,7 +3634,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3643,7 +3643,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3652,7 +3652,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3662,14 +3662,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 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.6.6 + image: grafana/build-container:1.6.7 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3687,7 +3687,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3707,7 +3707,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -4366,7 +4366,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -4390,7 +4390,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: release-npm-packages trigger: event: @@ -4626,7 +4626,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: artifacts-page trigger: event: @@ -4671,18 +4671,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4696,7 +4696,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4705,7 +4705,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4714,7 +4714,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4724,7 +4724,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4742,14 +4742,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4788,7 +4788,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: grafana-server - commands: - apt-get install -y netcat @@ -4865,7 +4865,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-storybook when: paths: @@ -4946,13 +4946,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4960,7 +4960,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-frontend trigger: ref: @@ -5005,7 +5005,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5013,25 +5013,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend-integration trigger: ref: @@ -5095,7 +5095,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5103,13 +5103,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update @@ -5125,7 +5125,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: postgres-integration-tests - commands: - apt-get update @@ -5141,7 +5141,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: mysql-integration-tests trigger: ref: @@ -5248,7 +5248,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5263,7 +5263,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5277,13 +5277,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5293,7 +5293,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5302,14 +5302,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 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.6.6 + image: grafana/build-container:1.6.7 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5318,7 +5318,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5327,7 +5327,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5337,7 +5337,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5356,14 +5356,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5403,7 +5403,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: grafana-server - commands: - apt-get install -y netcat @@ -5538,7 +5538,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5553,7 +5553,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5569,14 +5569,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5585,7 +5585,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-frontend trigger: ref: @@ -5619,7 +5619,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mkdir -p bin @@ -5640,7 +5640,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5662,7 +5662,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5671,25 +5671,25 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: test-backend-integration trigger: ref: @@ -5759,7 +5759,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5774,7 +5774,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5784,7 +5784,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5793,13 +5793,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - apt-get update @@ -5815,7 +5815,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: postgres-integration-tests - commands: - apt-get update @@ -5831,7 +5831,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5842,7 +5842,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5853,7 +5853,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: memcached-integration-tests trigger: ref: @@ -5980,7 +5980,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5995,7 +5995,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -6009,13 +6009,13 @@ steps: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6025,7 +6025,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6034,7 +6034,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6043,7 +6043,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -6053,7 +6053,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6061,7 +6061,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6080,7 +6080,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -6100,7 +6100,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.6.6 + image: grafana/build-container:1.6.7 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6451,6 +6451,6 @@ kind: secret name: aws_secret_access_key --- kind: signature -hmac: 5b2831b92627887ebe7ee9963796449981a12a96ea775a331fb84536598536ce +hmac: 86222a86386ae1d2afce23b4a15f09e97aaeb873275ed34ac73d733335d63e4b ... diff --git a/.nvmrc b/.nvmrc index bf79505bb85..9dfef472196 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.14.0 +v18.12.0 diff --git a/Dockerfile b/Dockerfile index e4ce997e7b8..f5d3881f5b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG BASE_IMAGE=alpine:3.15 -ARG JS_IMAGE=node:16-alpine3.15 +ARG JS_IMAGE=node:18-alpine3.15 ARG GO_IMAGE=golang:1.19.4-alpine3.17 ARG GO_SRC=go-builder diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md index 202d9e192b2..fb20192b939 100644 --- a/contribute/developer-guide.md +++ b/contribute/developer-guide.md @@ -18,7 +18,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen ``` brew install git brew install go -brew install node@16 +brew install node@18 npm install -g yarn ``` diff --git a/package.json b/package.json index c9255b114bd..0b666b4c385 100644 --- a/package.json +++ b/package.json @@ -436,7 +436,7 @@ ] }, "engines": { - "node": ">= 16" + "node": ">= 18" }, "packageManager": "yarn@3.3.0" } diff --git a/packages/grafana-ui/src/slate-plugins/braces.ts b/packages/grafana-ui/src/slate-plugins/braces.ts index 7af64918c11..d05360fffa6 100644 --- a/packages/grafana-ui/src/slate-plugins/braces.ts +++ b/packages/grafana-ui/src/slate-plugins/braces.ts @@ -2,7 +2,7 @@ import { Annotation } from 'slate'; import { Plugin } from 'slate-react'; import { v4 as uuidv4 } from 'uuid'; -const BRACES: any = { +const BRACES: Record = { '[': ']', '{': '}', '(': ')', diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx index 7f17338f7db..7091793c186 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx @@ -75,6 +75,7 @@ beforeEach(() => { config.featureToggles.publicDashboards = true; mockDashboard = createDashboardModelFixture({ uid: 'mockDashboardUid', + timezone: 'utc', }); mockPanel = new PanelModel({ @@ -172,7 +173,7 @@ describe('SharePublic', () => { await renderSharePublicDashboard({ panel: mockPanel, dashboard: mockDashboard, onDismiss: () => {} }); await screen.findByText('Welcome to Grafana public dashboards alpha!'); - expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 01:59:59')).toBeInTheDocument(); + expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 00:59:59')).toBeInTheDocument(); }); it('when modal is opened, then loader spinner appears and inputs are disabled', async () => { await renderSharePublicDashboard({ panel: mockPanel, dashboard: mockDashboard, onDismiss: () => {} }); diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index a0c1e6f792c..32c90995f10 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -105,7 +105,7 @@ FROM debian:buster-20220822 ENV GOVERSION=1.19.4 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=16.14.0-1nodesource1 \ + NODEVERSION=18.12.0-1nodesource1 \ YARNVERSION=1.22.19-1 # Use ARG so as not to persist environment variable in image @@ -141,7 +141,7 @@ RUN apt-get update && \ gem install --conservative -N fpm && \ ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \ curl -fsS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - curl -O https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\ + curl -O https://deb.nodesource.com/node_18.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\ dpkg -i nodejs_${NODEVERSION}_amd64.deb &&\ rm nodejs_${NODEVERSION}_amd64.deb &&\ curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ diff --git a/scripts/build/ci-build/README.md b/scripts/build/ci-build/README.md index 00d396d4b36..72bd15705f7 100644 --- a/scripts/build/ci-build/README.md +++ b/scripts/build/ci-build/README.md @@ -14,3 +14,5 @@ In order to build and publish the Grafana build Docker image, execute the follow docker build -t grafana/build-container: . docker push grafana/build-container: ``` + +If you're running on a machine that has an ARM chip (Apple M1/M2, etc.), add `--platform linux/amd64` to the `docker build` command. It can take approximately four hours for an initial build to complete. Due to caching, subsequent builds take less time (~10 mins or so). diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index d16b40b1eac..2bc37806f14 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -6,7 +6,7 @@ load( ) grabpl_version = 'v3.0.20' -build_image = 'grafana/build-container:1.6.6' +build_image = 'grafana/build-container:1.6.7' 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'