Browse Source

build: make pyyaml an optional dependency (#15566)

(cherry picked from commit d567bdba3dfec29afd914023fd280dcae043dc84)
Alexey Kuzmin 6 years ago
parent
commit
62c0f842ae
2 changed files with 13 additions and 6 deletions
  1. 6 4
      .circleci/config.yml
  2. 7 2
      DEPS

+ 6 - 4
.circleci/config.yml

@@ -720,8 +720,10 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-checkout
 
-  linux-x64-checkout:
+  linux-checkout-for-native-tests:
     <<: *machine-linux-2xlarge
+    environment:
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
     <<: *steps-checkout
 
   # Layer 2: Builds.
@@ -1223,15 +1225,15 @@ workflows:
                 - master
                 - *chromium-upgrade-branches
     jobs:
-      - linux-x64-checkout
+      - linux-checkout-for-native-tests
 
       # TODO(alexeykuzmin): Enable it back.
       # Tons of crashes right now, see
       # https://circleci.com/gh/electron/electron/67463
 #      - linux-x64-browsertests:
 #          requires:
-#            - linux-x64-checkout
+#            - linux-checkout-for-native-tests
 
       - linux-x64-unittests:
           requires:
-            - linux-x64-checkout
+            - linux-checkout-for-native-tests

+ 7 - 2
DEPS

@@ -34,6 +34,9 @@ vars = {
   'checkout_chromium': True,
   'checkout_node': True,
 
+  # It's only needed to parse the native tests configurations.
+  'checkout_pyyaml': False,
+
   # Python "requests" module is used for releases only.
   'checkout_requests': False,
 
@@ -64,8 +67,10 @@ deps = {
     'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")),
     'condition': 'checkout_node',
   },
-  'src/electron/vendor/pyyaml':
-    (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
+  'src/electron/vendor/pyyaml': {
+    'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
+    'condition': 'checkout_pyyaml',
+  },
   'src/electron/vendor/boto': {
     'url': Var('boto_git') + '/boto.git' + '@' +  Var('boto_version'),
     'condition': 'checkout_boto',