Commit 090c683f by Arve Knudsen Committed by GitHub

Drone: Don't build Windows installer for version branches (#28494)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent a378374c
...@@ -2510,7 +2510,6 @@ steps: ...@@ -2510,7 +2510,6 @@ steps:
- gcloud auth activate-service-account --key-file=gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json
- rm gcpkey.json - rm gcpkey.json
- cp C:\App\nssm-2.24.zip . - cp C:\App\nssm-2.24.zip .
- .\grabpl.exe windows-installer --edition oss --build-id $$env:DRONE_BUILD_NUMBER
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
...@@ -2834,7 +2833,6 @@ steps: ...@@ -2834,7 +2833,6 @@ steps:
- gcloud auth activate-service-account --key-file=gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json
- rm gcpkey.json - rm gcpkey.json
- cp C:\App\nssm-2.24.zip . - cp C:\App\nssm-2.24.zip .
- .\grabpl.exe windows-installer --edition enterprise --build-id $$env:DRONE_BUILD_NUMBER
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
......
...@@ -884,12 +884,12 @@ def get_windows_steps(edition, ver_mode, is_downstream=False): ...@@ -884,12 +884,12 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
'gcloud auth activate-service-account --key-file=gcpkey.json', 'gcloud auth activate-service-account --key-file=gcpkey.json',
'rm gcpkey.json', 'rm gcpkey.json',
'cp C:\\App\\nssm-2.24.zip .', '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 ( if (ver_mode == 'master' and (edition != 'enterprise' or is_downstream)) or ver_mode in (
'release', 'test-release', 'release', 'test-release',
): ):
installer_commands.extend([ installer_commands.extend([
'.\\grabpl.exe windows-installer --edition {}{} {}'.format(edition, bucket_part, ver_part),
'$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]', '$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]',
'gsutil cp $$fname gs://{}/{}/{}/'.format(bucket, edition, dir), 'gsutil cp $$fname gs://{}/{}/{}/'.format(bucket, edition, dir),
'gsutil cp "$$fname.sha256" gs://{}/{}/{}/'.format(bucket, edition, dir), 'gsutil cp "$$fname.sha256" gs://{}/{}/{}/'.format(bucket, edition, dir),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment