From 5f3f6c0073781215fd1aad2fc3344d366b24675f Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 23 Sep 2019 16:07:09 -0700
Subject: [PATCH] build: run publish jobs in the secure context and enable
 sccache

---
 .circleci/config.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47fe4d344b7c5..74d0be83864a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1170,6 +1170,7 @@ jobs:
       <<: *env-linux-2xlarge-release
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       <<: *env-release-build
+      <<: *env-enable-sccache
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
 
@@ -1221,6 +1222,7 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       <<: *env-ia32
       <<: *env-release-build
+      <<: *env-enable-sccache
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
 
@@ -1272,6 +1274,7 @@ jobs:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
       <<: *env-release-build
+      <<: *env-enable-sccache
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
@@ -1340,6 +1343,7 @@ jobs:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
       <<: *env-release-build
+      <<: *env-enable-sccache
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
@@ -1399,6 +1403,7 @@ jobs:
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
+      <<: *env-enable-sccache
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
@@ -1464,6 +1469,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-mas
       <<: *env-release-build
+      <<: *env-enable-sccache
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
       UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     <<: *steps-electron-build-for-publish
@@ -1731,32 +1737,38 @@ workflows:
   publish-x64-linux:
     when: << pipeline.parameters.run-linux-x64-publish >>
     jobs:
-    - linux-x64-publish
+    - linux-x64-publish:
+        context: release-env
 
   publish-ia32-linux:
     when: << pipeline.parameters.run-linux-ia32-publish >>
     jobs:
-    - linux-ia32-publish
+    - linux-ia32-publish:
+        context: release-env
 
   publish-arm-linux:
     when: << pipeline.parameters.run-linux-arm-publish >>
     jobs:
-    - linux-arm-publish
+    - linux-arm-publish:
+        context: release-env
   
   publish-arm64-linux:
     when: << pipeline.parameters.run-linux-arm64-publish >>
     jobs:
-    - linux-arm64-publish
+    - linux-arm64-publish:
+        context: release-env
   
   publish-osx:
     when: << pipeline.parameters.run-osx-publish >>
     jobs:
-    - osx-publish
+    - osx-publish:
+        context: release-env
 
   publish-mas:
     when: << pipeline.parameters.run-mas-publish >>
     jobs:
-    - mas-publish
+    - mas-publish:
+        context: release-env
 
   lint:
     when: << pipeline.parameters.run-lint >>