From 298ac20dc5ead53e5ee5af72015202be33724f01 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 1 Oct 2020 10:00:11 +0200 Subject: [PATCH] Drone: Upgrade build pipeline tool (#27949) * Drone: Don't use npx Signed-off-by: Arve Knudsen * Drone: Upgrade build pipeline tool Signed-off-by: Arve Knudsen --- .circleci/config.yml | 2 +- .drone.yml | 14 +++++++------- .../grafana-plugin-ci-alpine/scripts/deploy.sh | 2 +- .../docker/grafana-plugin-ci-e2e/scripts/deploy.sh | 2 +- .../docker/grafana-plugin-ci/scripts/deploy.sh | 2 +- scripts/lib.star | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ad3e6a6d47..29833ff28ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.5.14 + VERSION=0.5.15 curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl chmod +x grabpl mv grabpl /tmp diff --git a/.drone.yml b/.drone.yml index 75aa2be32f3..b77f321e86b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -241,7 +241,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/windows/grabpl.exe -OutFile grabpl.exe trigger: event: @@ -265,7 +265,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -341,7 +341,7 @@ steps: depends_on: - initialize -- name: frontend-metrics +- name: publish-frontend-metrics image: grafana/build-container:1.2.27 commands: - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY} @@ -514,7 +514,7 @@ steps: - name: release-next-npm-packages image: grafana/build-container:1.2.27 commands: - - npx lerna bootstrap + - ./node_modules/.bin/lerna bootstrap - echo "//registry.npmjs.org/:_authToken=$${NPM_TOKEN}" >> ~/.npmrc - ./scripts/circle-release-next-packages.sh environment: @@ -586,7 +586,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -634,7 +634,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh index cd0ec26fa79..e2917865917 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh @@ -43,7 +43,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter -curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl" +curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl" apk add --no-cache git # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh index b980969b27c..a0a997d7800 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh @@ -44,7 +44,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod 755 /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh index 1c6de19827f..330988532a4 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh @@ -27,7 +27,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.14/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/scripts/lib.star b/scripts/lib.star index db601c631cd..3faf07d3879 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -3,7 +3,7 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' alpine_image = 'alpine:3.12' windows_image = 'mcr.microsoft.com/windows:1809' -grabpl_version = '0.5.14' +grabpl_version = '0.5.15' git_image = 'alpine/git:v2.26.2' dockerize_version = '0.6.1' wix_image = 'grafana/ci-wix:0.1.1' @@ -558,7 +558,7 @@ def frontend_metrics_step(edition): return None return { - 'name': 'frontend-metrics', + 'name': 'publish-frontend-metrics', 'image': build_image, 'depends_on': [ 'initialize', @@ -812,7 +812,7 @@ def release_next_npm_packages_step(edition): }, }, 'commands': [ - 'npx lerna bootstrap', + './node_modules/.bin/lerna bootstrap', 'echo "//registry.npmjs.org/:_authToken=$${NPM_TOKEN}" >> ~/.npmrc', './scripts/circle-release-next-packages.sh', ],