From 95650aff080428872a6481b762f53d7febefc07a Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 12 Sep 2023 11:56:27 +0300 Subject: [PATCH] [v10.1.x] Nightlies: Bring back windows installers for main builds (#74708) Bring back windows installers for main builds (#74698) (cherry picked from commit 36728dd671c6dcc368ca2f3ce2d259e52cab46bb) # Conflicts: # .drone.yml --- .drone.yml | 21 ++++++++++++++++++++- scripts/drone/steps/lib.star | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 56a79de2bed..7b52c882eb3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2314,6 +2314,25 @@ steps: -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init +- commands: + - $$gcpKey = $$env:GCP_KEY + - '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) + > gcpkey.json' + - dos2unix gcpkey.json + - gcloud auth activate-service-account --key-file=gcpkey.json + - rm gcpkey.json + - cp C:\App\nssm-2.24.zip . + depends_on: + - windows-init + environment: + GCP_KEY: + from_secret: gcp_key + GITHUB_TOKEN: + from_secret: github_token + PRERELEASE_BUCKET: + from_secret: prerelease_bucket + image: grafana/ci-wix:0.1.1 + name: build-windows-installer trigger: branch: main event: @@ -4692,6 +4711,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: a49e733d21712d98fc2fbbf3accbe63e64d489144004c3f5e2fde9fee23e6e77 +hmac: 5a1f875a8dc0bc6d3a520f724350c2f2d7ad30674b9c8175a2ad2e507ffcdc6d ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index dd0d845a8c1..ebb04fc3e8c 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1296,6 +1296,7 @@ def get_windows_steps(ver_mode, bucket = "%PRERELEASE_BUCKET%"): if ver_mode in ( "release", "release-branch", + "main", ): gcp_bucket = "{}/artifacts/downloads".format(bucket) if ver_mode == "release":