From 5cbf4fa459ef9450758d7bd1d512fb8277788995 Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Wed, 19 Apr 2023 17:36:03 +0200 Subject: [PATCH] [v8.5.x] Chore: Upgrade Go to 1.19.8 (#66864) Chore: Upgrade Go to 1.19.8 --- .bingo/Variables.mk | 2 +- .drone.yml | 386 +++++++++++++++--------------- Dockerfile | 4 +- Dockerfile.ubuntu | 2 +- scripts/build/ci-build/Dockerfile | 2 +- scripts/drone/steps/lib.star | 4 +- 6 files changed, 200 insertions(+), 200 deletions(-) diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 33598267643..20e715fc656 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -21,7 +21,7 @@ DRONE := $(GOBIN)/drone-v1.4.0 $(DRONE): $(BINGO_DIR)/drone.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/drone-v1.4.0" - @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone" + @cd $(BINGO_DIR) && CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone" WIRE := $(GOBIN)/wire-v0.5.0 $(WIRE): $(BINGO_DIR)/wire.mod diff --git a/.drone.yml b/.drone.yml index 501e1c6764d..0918a7c416c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,17 +23,17 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl verify-drone @@ -51,13 +51,13 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -65,7 +65,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend - commands: - yarn run prettier:check @@ -76,19 +76,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -96,7 +96,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-frontend trigger: event: @@ -134,17 +134,17 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -152,7 +152,7 @@ steps: depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -161,7 +161,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -170,7 +170,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss @@ -178,13 +178,13 @@ steps: - gen-version - yarn-install environment: null - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: validate-scuemata - commands: - '# It is required that the generated Typescript be in sync with the input CUE @@ -197,7 +197,7 @@ steps: - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . --diff depends_on: - validate-scuemata - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: ensure-cuetsified - commands: - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss @@ -208,7 +208,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package - commands: - ./scripts/grafana-server/start-server @@ -221,7 +221,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: grafana-server - commands: - apt-get install -y netcat @@ -299,7 +299,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-storybook - commands: - yarn wait-on http://$HOST:$PORT @@ -319,7 +319,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition oss -archs amd64 @@ -398,7 +398,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: postgres-integration-tests - commands: - apt-get update @@ -413,7 +413,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: mysql-integration-tests trigger: event: @@ -457,13 +457,13 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - |- @@ -475,7 +475,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - yarn run prettier:checkDocs @@ -483,7 +483,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-docs - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -492,13 +492,13 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend-packages - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -545,13 +545,13 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - |- @@ -563,7 +563,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - yarn run prettier:checkDocs @@ -571,7 +571,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-docs - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -580,13 +580,13 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./scripts/ci-reference-docs-lint.sh ci depends_on: - build-frontend-packages - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -630,17 +630,17 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl verify-drone @@ -658,13 +658,13 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: shellcheck - commands: - ./bin/grabpl lint-backend --edition oss @@ -672,7 +672,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend - commands: - yarn run prettier:check @@ -683,19 +683,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -703,7 +703,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-frontend trigger: branch: main @@ -739,17 +739,17 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -770,7 +770,7 @@ steps: from_secret: github_token TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: trigger-test-release when: paths: @@ -794,7 +794,7 @@ steps: depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -803,7 +803,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -812,7 +812,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin @@ -822,13 +822,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: validate-scuemata - commands: - '# It is required that the generated Typescript be in sync with the input CUE @@ -841,7 +841,7 @@ steps: - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . --diff depends_on: - validate-scuemata - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -859,7 +859,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package - commands: - ./scripts/grafana-server/start-server @@ -872,7 +872,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: grafana-server - commands: - apt-get install -y netcat @@ -950,7 +950,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-storybook - commands: - ./bin/grabpl store-storybook --deployment canary --src-bucket grafana-storybook @@ -991,7 +991,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: publish-frontend-metrics when: repo: @@ -1001,7 +1001,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition oss @@ -1079,7 +1079,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: release-canary-npm-packages when: repo: @@ -1184,7 +1184,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: postgres-integration-tests - commands: - apt-get update @@ -1199,7 +1199,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: mysql-integration-tests trigger: branch: main @@ -1414,24 +1414,24 @@ steps: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss ${DRONE_TAG} depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -1440,7 +1440,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -1449,7 +1449,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin @@ -1459,13 +1459,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: validate-scuemata - commands: - '# It is required that the generated Typescript be in sync with the input CUE @@ -1478,7 +1478,7 @@ steps: - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . --diff depends_on: - validate-scuemata - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -1496,14 +1496,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition oss --shouldSave @@ -1540,7 +1540,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: grafana-server - commands: - apt-get install -y netcat @@ -1618,7 +1618,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --src-bucket "$${PRERELEASE_BUCKET}" --src-dir @@ -1720,23 +1720,23 @@ steps: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: shellcheck - commands: - |- @@ -1748,7 +1748,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - ./bin/grabpl lint-backend --edition oss @@ -1756,7 +1756,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend - commands: - yarn run prettier:check @@ -1767,19 +1767,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -1787,7 +1787,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-frontend trigger: event: @@ -1857,7 +1857,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: postgres-integration-tests - commands: - apt-get update @@ -1872,7 +1872,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: mysql-integration-tests trigger: event: @@ -1987,7 +1987,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2003,32 +2003,32 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: init-enterprise - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2037,7 +2037,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2046,7 +2046,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin @@ -2056,13 +2056,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: validate-scuemata - commands: - '# It is required that the generated Typescript be in sync with the input CUE @@ -2075,14 +2075,14 @@ steps: - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . --diff depends_on: - validate-scuemata - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: ensure-cuetsified - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2101,14 +2101,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition enterprise --shouldSave @@ -2146,7 +2146,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: grafana-server - commands: - apt-get install -y netcat @@ -2267,7 +2267,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "$${PRERELEASE_BUCKET}" @@ -2344,7 +2344,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2360,25 +2360,25 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: init-enterprise - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl gen-version ${DRONE_TAG} depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - |- @@ -2390,7 +2390,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -2398,7 +2398,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend - commands: - yarn run prettier:check @@ -2409,19 +2409,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -2429,7 +2429,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-frontend - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -2437,19 +2437,19 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration-enterprise2 trigger: event: @@ -2523,7 +2523,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2539,7 +2539,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: init-enterprise - commands: - apt-get update @@ -2554,7 +2554,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: postgres-integration-tests - commands: - apt-get update @@ -2569,7 +2569,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -2578,7 +2578,7 @@ steps: - init-enterprise environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2587,7 +2587,7 @@ steps: - init-enterprise environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: memcached-integration-tests trigger: event: @@ -3071,7 +3071,7 @@ steps: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl artifacts npm retrieve --tag v${TAG} @@ -3091,7 +3091,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: release-npm-packages trigger: event: @@ -3128,7 +3128,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.4 + image: golang:1.19.8 name: compile-build-cmd - depends_on: - grabpl @@ -3219,7 +3219,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.4 + image: golang:1.19.8 name: compile-build-cmd - depends_on: - grabpl @@ -3310,24 +3310,24 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3336,7 +3336,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -3345,7 +3345,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin @@ -3355,13 +3355,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: validate-scuemata - commands: - '# It is required that the generated Typescript be in sync with the input CUE @@ -3374,7 +3374,7 @@ steps: - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . --diff depends_on: - validate-scuemata - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: ensure-cuetsified - commands: - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -3392,14 +3392,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition oss --shouldSave @@ -3436,7 +3436,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: grafana-server - commands: - apt-get install -y netcat @@ -3514,7 +3514,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets" @@ -3586,23 +3586,23 @@ steps: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - make gen-go - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl shellcheck depends_on: - grabpl - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: shellcheck - commands: - |- @@ -3614,7 +3614,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - ./bin/grabpl lint-backend --edition oss @@ -3622,7 +3622,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend - commands: - yarn run prettier:check @@ -3633,19 +3633,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition oss depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -3653,7 +3653,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-frontend trigger: ref: @@ -3717,7 +3717,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: postgres-integration-tests - commands: - apt-get update @@ -3732,7 +3732,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: mysql-integration-tests trigger: ref: @@ -3830,7 +3830,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3843,32 +3843,32 @@ steps: depends_on: - clone-enterprise environment: {} - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: init-enterprise - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend - commands: - ./bin/grabpl build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -3877,7 +3877,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend - commands: - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise --build-id @@ -3887,7 +3887,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-frontend-packages - commands: - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin @@ -3897,13 +3897,13 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-plugins - commands: - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root . depends_on: - build-backend - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: validate-scuemata - commands: - '# It is required that the generated Typescript be in sync with the input CUE @@ -3916,7 +3916,7 @@ steps: - ./bin/linux-amd64/grafana-cli cue gen-ts --grafana-root . --diff depends_on: - validate-scuemata - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: ensure-cuetsified - commands: - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -3924,7 +3924,7 @@ steps: depends_on: - gen-version - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-backend-enterprise2 - commands: - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -3944,14 +3944,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: copy-packages-for-docker - commands: - ./bin/grabpl build-docker --edition enterprise --shouldSave @@ -3989,7 +3989,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: grafana-server - commands: - apt-get install -y netcat @@ -4067,7 +4067,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: build-storybook - commands: - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "grafana-static-assets" @@ -4115,7 +4115,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "grafana-static-assets" @@ -4185,7 +4185,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4198,25 +4198,25 @@ steps: depends_on: - clone-enterprise environment: {} - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: init-enterprise - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: yarn-install - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} depends_on: - init-enterprise - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: gen-version - commands: - |- @@ -4228,7 +4228,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: codespell - commands: - ./bin/grabpl lint-backend --edition enterprise @@ -4236,7 +4236,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend - commands: - yarn run prettier:check @@ -4247,19 +4247,19 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-frontend - commands: - ./bin/grabpl test-backend --edition enterprise depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend - commands: - ./bin/grabpl integration-tests --edition enterprise depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration - commands: - yarn run ci:test-frontend @@ -4267,7 +4267,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-frontend - commands: - ./bin/grabpl lint-backend --edition enterprise2 @@ -4275,19 +4275,19 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: lint-backend-enterprise2 - commands: - ./bin/grabpl test-backend --edition enterprise2 depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-enterprise2 - commands: - ./bin/grabpl integration-tests --edition enterprise2 depends_on: - wire-install - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: test-backend-integration-enterprise2 trigger: ref: @@ -4355,7 +4355,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4368,7 +4368,7 @@ steps: depends_on: - clone-enterprise environment: {} - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: init-enterprise - commands: - apt-get update @@ -4383,7 +4383,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: postgres-integration-tests - commands: - apt-get update @@ -4398,7 +4398,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -4407,7 +4407,7 @@ steps: - init-enterprise environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4416,7 +4416,7 @@ steps: - init-enterprise environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.5.5-go1.19.4 + image: grafana/build-container:1.5.5-go1.19.8 name: memcached-integration-tests trigger: ref: @@ -4724,6 +4724,6 @@ kind: secret name: aws_secret_access_key --- kind: signature -hmac: 39582869c26ad679dc57edb0f0cdf407dc9c78d2989f5950168fd3d710462678 +hmac: ea3044683103acec9dbb09a50a699c4b8174eb3ad887417a16627a262713f7c5 ... diff --git a/Dockerfile b/Dockerfile index 1e52d4ac7bb..020e9e66946 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.19.4-alpine3.15 as go-builder +FROM golang:1.19.8-alpine3.17 as go-builder RUN apk add --no-cache gcc g++ make @@ -40,7 +40,7 @@ RUN go mod verify RUN make build-go # Final stage -FROM alpine:3.15 +FROM alpine:3.17 LABEL maintainer="Grafana team " diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index cf176d59a8d..7c35c624a1c 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.4 AS go-builder +FROM golang:1.19.8 AS go-builder WORKDIR /src/grafana diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 82ef8b6a4c4..5caf114cae9 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -110,7 +110,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's. FROM debian:stretch-20210208 -ENV GOVERSION=1.19.4 \ +ENV GOVERSION=1.19.8 \ 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 d71b58eff6f..8b33ee91635 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.50-fixfpm' -build_image = 'grafana/build-container:1.5.5-go1.19.4' +build_image = 'grafana/build-container:1.5.5-go1.19.8' publish_image = 'grafana/grafana-ci-deploy:1.3.1' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' alpine_image = 'alpine:3.15' 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.4" +go_image = "golang:1.19.8" disable_tests = False trigger_oss = {