From e3398b36a22ceb342e48ff26de26e5a2225d15be Mon Sep 17 00:00:00 2001 From: Kevin Minehart Date: Thu, 20 Jul 2023 10:14:49 -0500 Subject: [PATCH] me windowS --- .drone.yml | 14 +++++--------- scripts/drone/steps/lib.star | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 91e2cf59378..5413eeca2d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2977,8 +2977,7 @@ steps: name: windows-init - commands: - $$gcpKey = $$env:GCP_KEY - - '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) - > gcpkey.json' + - $$gcpKey > gcpkey.json - dos2unix gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json @@ -3525,8 +3524,7 @@ steps: name: windows-init - commands: - $$gcpKey = $$env:GCP_KEY - - '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) - > gcpkey.json' + - $$gcpKey > gcpkey.json - dos2unix gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json @@ -3590,8 +3588,7 @@ steps: name: windows-init - commands: - $$gcpKey = $$env:GCP_KEY - - '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) - > gcpkey.json' + - $$gcpKey > gcpkey.json - dos2unix gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json @@ -4343,8 +4340,7 @@ steps: name: windows-init - commands: - $$gcpKey = $$env:GCP_KEY - - '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) - > gcpkey.json' + - $$gcpKey > gcpkey.json - dos2unix gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json - rm gcpkey.json @@ -5019,6 +5015,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: e88a3047df33738d302db2e0e4357cc4e1abbda7416cfbd9c5aa8c6ece08c596 +hmac: bdb72dfd574ab2ce9c5dabd0cf8180e1c1227b142a1306fe23283ce3d9d54670 ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 8524ebf98b3..97cddea28a7 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1309,7 +1309,7 @@ def get_windows_steps(ver_mode, bucket = "%PRERELEASE_BUCKET%", edition = "oss") ver_part = "--build-id $$env:{}".format(build_no) installer_commands = [ "$$gcpKey = $$env:GCP_KEY", - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json", + "$$gcpKey > gcpkey.json", # gcloud fails to read the file unless converted with dos2unix "dos2unix gcpkey.json", "gcloud auth activate-service-account --key-file=gcpkey.json",