From 090c683fea22cd00bde8e1b99378b36ce0b3ed17 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Fri, 23 Oct 2020 12:14:24 +0200 Subject: [PATCH] Drone: Don't build Windows installer for version branches (#28494) Signed-off-by: Arve Knudsen --- .drone.yml | 2 -- scripts/lib.star | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ed68fa4ebac..2663a4dd7de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2510,7 +2510,6 @@ steps: - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - - .\grabpl.exe windows-installer --edition oss --build-id $$env:DRONE_BUILD_NUMBER environment: GCP_KEY: from_secret: gcp_key @@ -2834,7 +2833,6 @@ steps: - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json - cp C:\App\nssm-2.24.zip . - - .\grabpl.exe windows-installer --edition enterprise --build-id $$env:DRONE_BUILD_NUMBER environment: GCP_KEY: from_secret: gcp_key diff --git a/scripts/lib.star b/scripts/lib.star index 2b85df38949..249380c517a 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -884,12 +884,12 @@ def get_windows_steps(edition, ver_mode, is_downstream=False): 'gcloud auth activate-service-account --key-file=gcpkey.json', 'rm gcpkey.json', 'cp C:\\App\\nssm-2.24.zip .', - '.\\grabpl.exe windows-installer --edition {}{} {}'.format(edition, bucket_part, ver_part), ] if (ver_mode == 'master' and (edition != 'enterprise' or is_downstream)) or ver_mode in ( 'release', 'test-release', ): installer_commands.extend([ + '.\\grabpl.exe windows-installer --edition {}{} {}'.format(edition, bucket_part, ver_part), '$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]', 'gsutil cp $$fname gs://{}/{}/{}/'.format(bucket, edition, dir), 'gsutil cp "$$fname.sha256" gs://{}/{}/{}/'.format(bucket, edition, dir),