IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drone: Don't build enterprise Windows installer unless downstream (#27919)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-09-30 10:36:33 +02:00 committed by GitHub
parent d105db3e5b
commit 739395abb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib.star
View File

@ -832,7 +832,7 @@ def get_windows_steps(edition, version_mode, is_downstream=False):
], ],
}, },
] ]
if version_mode == 'master': if version_mode == 'master' and (edition != 'enterprise' or is_downstream):
installer_commands = [ installer_commands = [
'$$gcpKey = $$env:GCP_KEY', '$$gcpKey = $$env:GCP_KEY',
'[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json', '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json',
@ -842,13 +842,10 @@ def get_windows_steps(edition, version_mode, is_downstream=False):
'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 {} --build-id $$env:{}'.format(edition, build_no), '.\\grabpl.exe windows-installer --edition {} --build-id $$env:{}'.format(edition, build_no),
]
if edition != 'enterprise' or is_downstream:
installer_commands.extend([
'$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]', '$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]',
'gsutil cp $$fname gs://grafana-downloads/{}/{}/'.format(edition, version_mode), 'gsutil cp $$fname gs://grafana-downloads/{}/{}/'.format(edition, version_mode),
'gsutil cp "$$fname.sha256" gs://grafana-downloads/{}/{}/'.format(edition, version_mode), 'gsutil cp "$$fname.sha256" gs://grafana-downloads/{}/{}/'.format(edition, version_mode),
]) ]
steps.append({ steps.append({
'name': 'build-windows-installer', 'name': 'build-windows-installer',
'image': wix_image, 'image': wix_image,