From 1336978de99ffd3eb088e56f20f2e077b195aeb9 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 10 May 2021 01:18:59 -0700
Subject: [PATCH] build: use executors instead of YAML templating (#29075)

---
 .circleci/config.yml | 235 +++++++++++++++++++++++++------------------
 1 file changed, 138 insertions(+), 97 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c24703dacc8c..e3d6b26ff887 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,6 +57,35 @@ parameters:
     type: boolean
     default: false
 
+# Executors
+executors:
+  linux-docker:
+    parameters:
+      size:
+        description: "Docker executor size"
+        default: 2xlarge+
+        type: enum
+        enum: ["medium", "xlarge", "2xlarge+"]
+    docker:
+      - image: electron.azurecr.io/build:6555a80939fb4c3ddf9343b3f140e573f40de225
+    resource_class: << parameters.size >>
+
+  macos:
+    parameters:
+      size:
+        description: "macOS executor size"
+        default: large
+        type: enum
+        enum: ["medium", "large"]
+    macos:
+      xcode: "12.4.0"
+    resource_class: << parameters.size >>
+
+  # Electron Runners
+  apple-silicon:
+    resource_class: electronjs/macos-arm64
+    machine: true
+
 # The config expects the following environment variables to be set:
 #  - "SLACK_WEBHOOK" Slack hook URL to send notifications.
 #
@@ -66,36 +95,6 @@ parameters:
 # CircleCI docs on variables:
 # https://circleci.com/docs/2.0/env-vars/
 
-# Build machines configs.
-docker-image: &docker-image
-  docker:
-    - image: electron.azurecr.io/build:6555a80939fb4c3ddf9343b3f140e573f40de225
-
-machine-linux-medium: &machine-linux-medium
-  <<: *docker-image
-  resource_class: medium
-
-machine-linux-xlarge: &machine-linux-xlarge
-  <<: *docker-image
-  resource_class: xlarge
-
-machine-linux-2xlarge: &machine-linux-2xlarge
-  <<: *docker-image
-  resource_class: 2xlarge+
-
-machine-mac: &machine-mac
-  macos:
-    xcode: "12.4.0"
-
-machine-mac-large: &machine-mac-large
-  resource_class: large
-  macos:
-    xcode: "12.4.0"
-
-machine-mac-arm64: &machine-mac-arm64
-  resource_class: electronjs/macos-arm64
-  machine: true
-
 # Build configurations options.
 env-testing-build: &env-testing-build
   GN_CONFIG: //electron/build/args/testing.gn
@@ -1689,13 +1688,17 @@ commands:
 jobs:
   # Layer 0: Lint. Standalone.
   lint:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
     <<: *steps-lint
 
   ts-compile-doc-change:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
@@ -1703,7 +1706,7 @@ jobs:
 
   # Layer 1: Checkout.
   linux-checkout:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1716,7 +1719,7 @@ jobs:
           restore-src-cache: false
 
   linux-checkout-fast:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1728,14 +1731,14 @@ jobs:
           persist-checkout: true
 
   linux-checkout-and-save-cache:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-checkout-and-save-cache
 
   linux-checkout-for-native-tests:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
@@ -1747,7 +1750,7 @@ jobs:
           persist-checkout: true
 
   linux-checkout-for-native-tests-with-no-patches:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
@@ -1759,7 +1762,7 @@ jobs:
           persist-checkout: true
 
   mac-checkout:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1774,7 +1777,7 @@ jobs:
           restore-src-cache: false
 
   mac-checkout-fast:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1788,7 +1791,7 @@ jobs:
           persist-checkout: true
 
   mac-checkout-and-save-cache:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1798,7 +1801,7 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1811,7 +1814,7 @@ jobs:
           use-out-cache: false
 
   linux-x64-testing-asan:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1827,7 +1830,7 @@ jobs:
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1841,14 +1844,16 @@ jobs:
           use-out-cache: false
 
   linux-x64-testing-gn-check:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
     <<: *steps-electron-gn-check
 
   linux-x64-release:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1861,7 +1866,7 @@ jobs:
           checkout: true
 
   linux-x64-publish:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1873,7 +1878,7 @@ jobs:
           checkout: true
 
   linux-x64-publish-skip-checkout:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1885,7 +1890,7 @@ jobs:
           checkout: false
 
   linux-ia32-testing:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-ia32
@@ -1899,7 +1904,7 @@ jobs:
           use-out-cache: false
 
   linux-ia32-release:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-ia32
@@ -1913,7 +1918,7 @@ jobs:
           checkout: true
 
   linux-ia32-publish:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-ia32
@@ -1927,7 +1932,7 @@ jobs:
           checkout: true
 
   linux-ia32-publish-skip-checkout:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-ia32
@@ -1941,7 +1946,7 @@ jobs:
           checkout: false
 
   linux-arm-testing:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-arm
@@ -1957,7 +1962,7 @@ jobs:
           use-out-cache: false
 
   linux-arm-release:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -1971,7 +1976,7 @@ jobs:
           checkout: true
 
   linux-arm-publish:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -1986,7 +1991,7 @@ jobs:
           checkout: true
 
   linux-arm-publish-skip-checkout:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -2000,7 +2005,7 @@ jobs:
           checkout: false
 
   linux-arm64-testing:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-global
       <<: *env-arm64
@@ -2016,7 +2021,9 @@ jobs:
           use-out-cache: false
 
   linux-arm64-testing-gn-check:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-arm64
@@ -2024,7 +2031,7 @@ jobs:
     <<: *steps-electron-gn-check
 
   linux-arm64-release:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2038,7 +2045,7 @@ jobs:
           checkout: true
 
   linux-arm64-publish:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2052,7 +2059,7 @@ jobs:
           checkout: true
 
   linux-arm64-publish-skip-checkout:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2065,7 +2072,7 @@ jobs:
           checkout: false
 
   osx-testing-x64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2080,14 +2087,16 @@ jobs:
           attach: false
 
   osx-testing-x64-gn-check:
-    <<: *machine-mac
+    executor:
+      name: macos
+      size: medium
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
     <<: *steps-electron-gn-check
 
   osx-publish-x64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2099,7 +2108,7 @@ jobs:
           checkout: true
 
   osx-publish-arm64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2112,7 +2121,7 @@ jobs:
           checkout: true
 
   osx-publish-x64-skip-checkout:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2124,7 +2133,7 @@ jobs:
           checkout: false
 
   osx-publish-arm64-skip-checkout:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2137,7 +2146,7 @@ jobs:
           checkout: false
 
   osx-testing-arm64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2154,7 +2163,7 @@ jobs:
           attach: false
 
   mas-testing-x64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large
       <<: *env-mas
@@ -2170,7 +2179,9 @@ jobs:
           attach: false
 
   mas-testing-x64-gn-check:
-    <<: *machine-mac
+    executor:
+      name: macos
+      size: medium
     environment:
       <<: *env-machine-mac
       <<: *env-mas
@@ -2178,7 +2189,7 @@ jobs:
     <<: *steps-electron-gn-check
   
   mas-publish:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2191,7 +2202,7 @@ jobs:
           checkout: true
 
   mas-publish-arm64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2204,7 +2215,7 @@ jobs:
           checkout: true          
 
   mas-publish-x64-skip-checkout:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2216,7 +2227,7 @@ jobs:
           checkout: false
 
   mas-publish-arm64-skip-checkout:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2229,7 +2240,7 @@ jobs:
           checkout: false
 
   mas-testing-arm64:
-    <<: *machine-mac-large
+    executor: macos
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2247,7 +2258,7 @@ jobs:
 
   # Layer 3: Tests.
   linux-x64-unittests:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
@@ -2255,7 +2266,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-disabled-unittests:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
@@ -2264,7 +2275,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-chromium-unittests:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-unittests
@@ -2273,7 +2284,7 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-browsertests:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-2xlarge
       <<: *env-browsertests
@@ -2282,7 +2293,9 @@ jobs:
     <<: *steps-native-tests
 
   linux-x64-testing-tests:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2291,7 +2304,9 @@ jobs:
     <<: *steps-tests
 
   linux-x64-testing-asan-tests:
-    <<: *machine-linux-xlarge
+    executor:
+      name: linux-docker
+      size: xlarge
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2302,7 +2317,9 @@ jobs:
     <<: *steps-tests
 
   linux-x64-testing-nan:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2310,7 +2327,7 @@ jobs:
     <<: *steps-test-nan
 
   linux-x64-testing-node:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2318,7 +2335,9 @@ jobs:
     <<: *steps-test-node
 
   linux-x64-release-tests:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2326,7 +2345,9 @@ jobs:
     <<: *steps-tests
 
   linux-x64-verify-ffmpeg:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
@@ -2334,7 +2355,9 @@ jobs:
     <<: *steps-verify-ffmpeg
 
   linux-ia32-testing-tests:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2344,7 +2367,9 @@ jobs:
     <<: *steps-tests
 
   linux-ia32-testing-nan:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2353,7 +2378,7 @@ jobs:
     <<: *steps-test-nan
 
   linux-ia32-testing-node:
-    <<: *machine-linux-2xlarge
+    executor: linux-docker
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2362,7 +2387,9 @@ jobs:
     <<: *steps-test-node
 
   linux-ia32-release-tests:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2371,7 +2398,9 @@ jobs:
     <<: *steps-tests
 
   linux-ia32-verify-ffmpeg:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-ia32
@@ -2380,7 +2409,9 @@ jobs:
     <<: *steps-verify-ffmpeg
 
   osx-testing-x64-tests:
-    <<: *machine-mac-large
+    executor:
+      name: macos
+      size: medium
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2388,7 +2419,7 @@ jobs:
     <<: *steps-tests
 
   osx-testing-arm64-tests:  
-    <<: *machine-mac-arm64
+    executor: apple-silicon
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2396,7 +2427,9 @@ jobs:
     <<: *steps-tests
 
   mas-testing-x64-tests:
-    <<: *machine-mac-large
+    executor:
+      name: macos
+      size: medium
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2404,7 +2437,7 @@ jobs:
     <<: *steps-tests
 
   mas-testing-arm64-tests:
-    <<: *machine-mac-arm64
+    executor: apple-silicon
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2413,7 +2446,9 @@ jobs:
 
   # Layer 4: Summary.
   linux-x64-release-summary:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
@@ -2421,7 +2456,9 @@ jobs:
       - *step-maybe-notify-slack-success
 
   linux-ia32-release-summary:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
@@ -2429,7 +2466,9 @@ jobs:
       - *step-maybe-notify-slack-success
 
   linux-arm-release-summary:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications
@@ -2437,7 +2476,9 @@ jobs:
       - *step-maybe-notify-slack-success
 
   linux-arm64-release-summary:
-    <<: *machine-linux-medium
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-send-slack-notifications