From 7183b01df12f8de62a1fcc1253aef8bb8c490ee8 Mon Sep 17 00:00:00 2001
From: Malcolm Holmes <mdh@odoko.co.uk>
Date: Tue, 7 Dec 2021 18:18:35 +0000
Subject: [PATCH] Fix windows enterprise

---
 .drone.yml                   | 11 ++++++++++-
 scripts/drone/steps/lib.star |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 83cbeebcefe..ffff1e11da1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1955,6 +1955,9 @@ steps:
   - cp C:\App\grabpl.exe grabpl.exe
   depends_on:
   - clone
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
   image: grafana/ci-wix:0.1.1
   name: initialize
 - commands:
@@ -2974,6 +2977,9 @@ steps:
   - cp C:\App\grabpl.exe grabpl.exe
   depends_on:
   - clone
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
   image: grafana/ci-wix:0.1.1
   name: initialize
 - commands:
@@ -4083,6 +4089,9 @@ steps:
   - cp C:\App\grabpl.exe grabpl.exe
   depends_on:
   - clone
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
   image: grafana/ci-wix:0.1.1
   name: initialize
 - commands:
@@ -4175,6 +4184,6 @@ kind: secret
 name: prerelease_bucket
 ---
 kind: signature
-hmac: 24874ad5a1577c95fc56023357c8c377a5738082d48a8dc125b4e14d6a6cc9cf
+hmac: 1f99ba5e72cb86a739c7f0b09055b3c058f4408dba1c2c97704624fa61133c2a
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index a796ff14cbb..0eb4fec234b 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1105,6 +1105,10 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
             'C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise{}'.format(source_commit),
             'cp C:\\App\\grabpl.exe grabpl.exe',
         ])
+        if 'environment' in steps[1]:
+            steps[1]['environment'] + {'GITHUB_TOKEN': from_secret(github_token)}
+        else:
+            steps[1]['environment'] = {'GITHUB_TOKEN': from_secret(github_token)}
 
     return steps