diff --git a/.drone.yml b/.drone.yml index 3b405645cb6..50599089cb2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -74,13 +74,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build verify-starlark . depends_on: - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-starlark trigger: event: @@ -127,13 +127,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -153,7 +153,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - yarn run ci:test-frontend @@ -162,7 +162,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: event: @@ -216,7 +216,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -225,7 +225,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn run prettier:check @@ -237,7 +237,7 @@ steps: - clone-enterprise environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-frontend trigger: event: @@ -291,7 +291,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -302,7 +302,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -312,7 +312,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -321,19 +321,19 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -341,7 +341,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: event: @@ -390,7 +390,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST" @@ -410,13 +410,13 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - make gen-go depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update && apt-get install make @@ -425,7 +425,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.4 + image: golang:1.20.6 name: lint-backend trigger: event: @@ -481,7 +481,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -490,7 +490,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -498,18 +498,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -532,7 +532,7 @@ steps: from_secret: github_token_pr TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: trigger-test-release when: branch: main @@ -560,7 +560,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -569,7 +569,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -580,7 +580,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -588,7 +588,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -599,7 +599,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ./scripts/grafana-server/start-server @@ -612,7 +612,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -715,7 +715,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: paths: @@ -726,7 +726,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -863,7 +863,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mkdir -p bin @@ -876,7 +876,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -890,7 +890,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -899,13 +899,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -922,7 +922,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -939,7 +939,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -949,7 +949,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -959,7 +959,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: event: @@ -1011,7 +1011,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - |- @@ -1023,7 +1023,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: codespell - commands: - yarn run prettier:checkDocs @@ -1031,7 +1031,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1075,13 +1075,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: shellcheck trigger: event: @@ -1122,7 +1122,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - |- @@ -1134,7 +1134,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: codespell - commands: - yarn run prettier:checkDocs @@ -1142,7 +1142,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1195,13 +1195,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1209,7 +1209,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: branch: main @@ -1249,7 +1249,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn run prettier:check @@ -1260,7 +1260,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: lint-frontend trigger: branch: main @@ -1302,7 +1302,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1311,7 +1311,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1319,19 +1319,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -1339,7 +1339,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: branch: main @@ -1381,12 +1381,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update && apt-get install make @@ -1395,7 +1395,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.4 + image: golang:1.20.6 name: lint-backend - commands: - ./bin/build verify-drone @@ -1449,7 +1449,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1458,7 +1458,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1466,25 +1466,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1493,7 +1493,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1504,7 +1504,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1514,7 +1514,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1532,7 +1532,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ./scripts/grafana-server/start-server @@ -1545,7 +1545,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -1648,7 +1648,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: paths: @@ -1659,7 +1659,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1703,7 +1703,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: publish-frontend-metrics when: repo: @@ -1796,7 +1796,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: release-canary-npm-packages when: paths: @@ -1903,7 +1903,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1916,7 +1916,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1924,13 +1924,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -1947,7 +1947,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -1964,7 +1964,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -1974,7 +1974,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1984,7 +1984,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: branch: main @@ -2210,13 +2210,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.20.4 + image: golang:1.20.6 name: whats-new-checker trigger: event: @@ -2266,32 +2266,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -2300,7 +2300,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -2309,7 +2309,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -2319,7 +2319,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -2337,14 +2337,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2383,7 +2383,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -2460,7 +2460,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: event: @@ -2519,7 +2519,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: store-npm-packages trigger: event: @@ -2565,13 +2565,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2579,7 +2579,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: event: @@ -2621,7 +2621,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2630,7 +2630,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2638,19 +2638,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -2658,7 +2658,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: event: @@ -2773,7 +2773,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2790,7 +2790,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2798,19 +2798,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2820,7 +2820,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2829,14 +2829,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2845,7 +2845,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2854,7 +2854,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2864,7 +2864,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2882,14 +2882,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2929,7 +2929,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -3064,7 +3064,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3081,7 +3081,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3091,14 +3091,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -3107,7 +3107,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: event: @@ -3147,7 +3147,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mkdir -p bin @@ -3170,7 +3170,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3182,7 +3182,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3192,7 +3192,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3201,19 +3201,19 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -3221,7 +3221,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: event: @@ -3358,7 +3358,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3375,7 +3375,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3383,19 +3383,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3405,7 +3405,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3414,7 +3414,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -3423,7 +3423,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -3433,14 +3433,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --sign ${DRONE_TAG} @@ -3458,7 +3458,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -3478,7 +3478,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -3616,7 +3616,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3724,7 +3724,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3799,7 +3799,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -3862,7 +3862,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise2 @@ -3926,7 +3926,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build publish aws --image grafana/grafana-enterprise --repo grafana-labs/grafanaenterprise @@ -3977,7 +3977,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}} @@ -4046,7 +4046,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${{DRONE_TAG}} --src-bucket $${{PRERELEASE_BUCKET}} @@ -4115,12 +4115,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -4144,7 +4144,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: release-npm-packages trigger: event: @@ -4181,7 +4181,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4272,7 +4272,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4626,32 +4626,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4660,7 +4660,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4671,7 +4671,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4681,7 +4681,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4699,14 +4699,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4745,7 +4745,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -4822,7 +4822,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-storybook when: paths: @@ -4903,13 +4903,13 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4917,7 +4917,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: ref: @@ -4953,7 +4953,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4962,7 +4962,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4970,19 +4970,19 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -4990,7 +4990,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: ref: @@ -5060,7 +5060,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5068,13 +5068,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -5091,7 +5091,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -5108,7 +5108,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5118,7 +5118,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5128,7 +5128,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: ref: @@ -5233,7 +5233,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5249,7 +5249,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5257,19 +5257,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5279,7 +5279,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5288,14 +5288,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5304,7 +5304,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5315,7 +5315,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -5325,7 +5325,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -5344,14 +5344,14 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -5391,7 +5391,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: grafana-server - commands: - apt-get install -y netcat @@ -5532,7 +5532,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5548,7 +5548,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5558,14 +5558,14 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - yarn betterer ci depends_on: - init-enterprise - yarn-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -5574,7 +5574,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-frontend trigger: ref: @@ -5608,7 +5608,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mkdir -p bin @@ -5630,7 +5630,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5642,7 +5642,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5652,7 +5652,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5661,19 +5661,19 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend - commands: - go test -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find @@ -5681,7 +5681,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: test-backend-integration trigger: ref: @@ -5751,7 +5751,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5767,7 +5767,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5777,7 +5777,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5786,13 +5786,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -5809,7 +5809,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -5826,7 +5826,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5836,7 +5836,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5846,7 +5846,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: ref: @@ -5973,7 +5973,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5989,7 +5989,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5997,19 +5997,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6019,7 +6019,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6028,7 +6028,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -6039,7 +6039,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -6049,7 +6049,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6057,7 +6057,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -6076,7 +6076,7 @@ steps: from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: package-enterprise2 - commands: - ./bin/build upload-cdn --edition enterprise2 @@ -6096,7 +6096,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package-enterprise2 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise2 --shouldSave @@ -6256,7 +6256,7 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6264,13 +6264,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -6287,7 +6287,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -6304,7 +6304,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6314,7 +6314,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6324,7 +6324,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: event: @@ -6401,7 +6401,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -6418,7 +6418,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -6428,7 +6428,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -6437,13 +6437,13 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - init-enterprise - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: verify-gen-jsonnet - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: wire-install - commands: - apt-get update @@ -6460,7 +6460,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: postgres-integration-tests - commands: - apt-get update @@ -6477,7 +6477,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -6487,7 +6487,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -6497,7 +6497,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.7.4 + image: grafana/build-container:1.7.5 name: memcached-integration-tests trigger: event: @@ -6748,11 +6748,11 @@ platform: steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.4 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.5 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.17.1 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.4 + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.6 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39 @@ -6770,11 +6770,11 @@ steps: name: scan-unknown-low-medium-vulnerabilities - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.4 + - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.5 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.17.1 - trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.4 + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.6 - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39 @@ -6817,7 +6817,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.20.4 + image: golang:1.20.6 name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss @@ -7016,6 +7016,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: 66deda3e7f58ed026747b64d671147eaca082806747fc1b1dc7f56ec3864095e +hmac: 7cd3d4407d9f8995606ccf0bdca8be8dc4c0a99ae61bacc86c129fd30180738e ... diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3fceb0d3545..7ce33991879 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: name: Set go version uses: actions/setup-go@v3 with: - go-version: '1.19.2' + go-version: '1.20.6' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/pr-codeql-analysis-go.yml b/.github/workflows/pr-codeql-analysis-go.yml index 16f61aa9e9a..1116aa26464 100644 --- a/.github/workflows/pr-codeql-analysis-go.yml +++ b/.github/workflows/pr-codeql-analysis-go.yml @@ -23,7 +23,7 @@ jobs: - name: Set go version uses: actions/setup-go@v3 with: - go-version: '1.19.2' + go-version: '1.20.6' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/Dockerfile b/Dockerfile index 441be9dfa64..1383a37152a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.17 ARG JS_IMAGE=node:18-alpine3.17 ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.20.4-alpine3.17 +ARG GO_IMAGE=golang:1.20.6-alpine3.17 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index 5b113040eba..adbe11ec17e 100644 --- a/Makefile +++ b/Makefile @@ -207,7 +207,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. --build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \ --build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \ --build-arg BASE_IMAGE=ubuntu:20.04 \ - --build-arg GO_IMAGE=golang:1.20.4 \ + --build-arg GO_IMAGE=golang:1.20.6 \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ $(DOCKER_BUILD_ARGS) diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 992c8d43e9d..3389da58212 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's. FROM debian:buster-20220822 -ENV GOVERSION=1.20.4 \ +ENV GOVERSION=1.20.6 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=18.12.0-1nodesource1 \ diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index 5226779b1ea..7b73849d7d2 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -4,11 +4,11 @@ This module contains all the docker images that are used to build test and publi images = { "cloudsdk_image": "google/cloud-sdk:431.0.0", - "build_image": "grafana/build-container:1.7.4", + "build_image": "grafana/build-container:1.7.5", "publish_image": "grafana/grafana-ci-deploy:1.3.3", "alpine_image": "alpine:3.17.1", "curl_image": "byrnedo/alpine-curl:0.1.8", - "go_image": "golang:1.20.4", + "go_image": "golang:1.20.6", "plugins_slack_image": "plugins/slack", "postgres_alpine_image": "postgres:12.3-alpine", "mysql5_image": "mysql:5.7.39",