diff --git a/.drone.yml b/.drone.yml index 55d899bf8e9..07f7ed4d8ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1115,12 +1115,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -1587,12 +1581,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -2048,12 +2036,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -2513,12 +2495,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -2957,12 +2933,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -3421,12 +3391,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -3556,6 +3520,6 @@ kind: secret name: drone_token --- kind: signature -hmac: 6286505bce5b02c170a374f23a06097f656485a893023fd81ab7456a3419d667 +hmac: 937b1a90380e210f04594a27aeadc40110d953e2990c1c0ca65c43924c9f15e2 ... diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index ed37a28731b..b2aca6bd34e 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -167,7 +167,7 @@ def get_oss_pipelines(trigger, ver_mode): ), pipeline( name='oss-windows-{}'.format(ver_mode), edition=edition, trigger=trigger, - steps=[download_grabpl_step()] + initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_package_steps, + steps=initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_package_steps, platform='windows', depends_on=['oss-build-{}'.format(ver_mode)], ), ] @@ -184,7 +184,7 @@ def get_enterprise_pipelines(trigger, ver_mode): ), pipeline( name='enterprise-windows-{}'.format(ver_mode), edition=edition, trigger=trigger, - steps=[download_grabpl_step()] + initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_package_steps, + steps=initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_package_steps, platform='windows', depends_on=['enterprise-build-{}'.format(ver_mode)], ), ]