From c7b8d85ce5e7553f6d33f02b5cffa622ffaa0255 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Wed, 9 Sep 2020 10:20:23 +0200 Subject: [PATCH] Chore: Upgrade grabpl (#27470) Signed-off-by: Arve Knudsen --- .circleci/config.yml | 2 +- .drone.yml | 6 +++--- .../docker/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 | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 59b293905b6..14e8d9d92ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.5.7 + VERSION=0.5.8 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 e915c814b76..7a7625f499e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ steps: - yarn install --frozen-lockfile --no-progress environment: DOCKERIZE_VERSION: 0.6.1 - GRABPL_VERSION: 0.5.7 + GRABPL_VERSION: 0.5.8 - name: lint-backend image: grafana/build-container:1.2.26 @@ -249,7 +249,7 @@ steps: - yarn install --frozen-lockfile --no-progress environment: DOCKERIZE_VERSION: 0.6.1 - GRABPL_VERSION: 0.5.7 + GRABPL_VERSION: 0.5.8 - name: lint-backend image: grafana/build-container:1.2.26 @@ -515,7 +515,7 @@ steps: - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.7/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/oss/master/grafana-7.2.0-9fffe273pre.windows-amd64.zip -OutFile grafana.zip - cp C:\App\nssm-2.24.zip . - ./grabpl.exe windows-installer --edition oss grafana.zip 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 66351d1f94e..2b4ded252d9 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.7/grabpl" +curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.8/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 079280ac596..802286e0b9b 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.7/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.8/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 15f9b9eabb7..e69e7821329 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.7/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.8/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/scripts/lib.star b/scripts/lib.star index 1334f79fb03..ede39a35ad6 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.2.0' alpine_image = 'alpine:3.12' windows_image = 'mcr.microsoft.com/windows:1809' -grabpl_version = '0.5.7' +grabpl_version = '0.5.8' def pr_pipelines(edition): services = [