From 334ee9c4a744a316ec94ae43c540f02f851f784b Mon Sep 17 00:00:00 2001
From: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
Date: Fri, 11 Feb 2022 14:38:40 +0000
Subject: [PATCH] Build: build enterprise2 with OSS (#45317)

* Build: build enterprise2 with OSS
---
 .drone.yml                   | 14 ++++----------
 scripts/drone/steps/lib.star |  8 +++++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8214f48acd3..d9f9baf08e4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3431,9 +3431,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - clone-enterprise
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
+  environment: {}
   image: grafana/build-container:1.4.9
   name: initialize
 - commands:
@@ -3766,9 +3764,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - clone-enterprise
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
+  environment: {}
   image: grafana/build-container:1.4.9
   name: initialize
 - commands:
@@ -3931,9 +3927,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - clone-enterprise
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
+  environment: {}
   image: grafana/build-container:1.4.9
   name: initialize
 - commands:
@@ -4218,6 +4212,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 5c4a8e18a79c5031b622d3c54a571d91683dc7ccf73115eae29dc95cf5216a19
+hmac: 1d7c4a778a9dcf8f7f69100cdef990a89ef563383c7b81ea79df1a04b815343d
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 1bc2ff0f46b..d05c70fc674 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -64,8 +64,12 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de
         if ver_mode == 'release':
             committish = '${DRONE_TAG}'
             source_commit = ' ${DRONE_TAG}'
+            environment = {
+                  'GITHUB_TOKEN': from_secret(github_token),
+            }
         elif ver_mode == 'release-branch':
             committish = '${DRONE_BRANCH}'
+            environment = {}
         else:
             if is_downstream:
                 source_commit = ' $${SOURCE_COMMIT}'
@@ -79,9 +83,7 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de
                 'depends_on': [
                     'clone-enterprise',
                 ],
-                'environment': {
-                  'GITHUB_TOKEN': from_secret(github_token),
-                },
+                'environment': environment,
                 'commands': [
                                 'mv bin/grabpl /tmp/',
                                 'rmdir bin',