From 262a6faad0f44f3708b7bc8349af2b82f2d4aba6 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 29 Sep 2020 14:24:18 +0200 Subject: [PATCH] Chore: Upgrade build-pipeline tool (#27888) Signed-off-by: Arve Knudsen --- .circleci/config.yml | 2 +- .drone.yml | 10 +++++----- .../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, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f25dc67684..1ce5915fb9b 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.9 + VERSION=0.5.11 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 05a5da3e544..de512f13be8 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.10/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/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.10/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/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.10/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -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.10/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/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.10/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/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 2b4ded252d9..5173ba0fb3d 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.8/grabpl" +curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/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 802286e0b9b..a1301451b16 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.8/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/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 e69e7821329..2ab5ca05cfb 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.8/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.11/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/scripts/lib.star b/scripts/lib.star index 6ed1b155385..617d8e79874 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.1' alpine_image = 'alpine:3.12' windows_image = 'mcr.microsoft.com/windows:1809' -grabpl_version = '0.5.10' +grabpl_version = '0.5.11' git_image = 'alpine/git:v2.26.2' dockerize_version = '0.6.1' wix_image = 'grafana/ci-wix:0.1.1'