Skip to content

Commit

Permalink
build: make pyyaml an optional dependency (#15565)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeykuzmin authored and John Kleinschmidt committed Nov 5, 2018
1 parent a19d20c commit 9b05381
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
20 changes: 11 additions & 9 deletions .circleci/config.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -721,14 +721,16 @@ jobs:
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
<<: *steps-checkout <<: *steps-checkout


linux-x64-checkout: linux-checkout-for-native-tests:
<<: *machine-linux-2xlarge <<: *machine-linux-2xlarge
environment:
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
<<: *steps-checkout <<: *steps-checkout


linux-x64-checkout-no-patches: linux-checkout-for-native-tests-with-no-patches:
<<: *machine-linux-2xlarge <<: *machine-linux-2xlarge
environment: environment:
GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False' GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
<<: *steps-checkout <<: *steps-checkout


# Layer 2: Builds. # Layer 2: Builds.
Expand Down Expand Up @@ -1247,25 +1249,25 @@ workflows:
- master - master
- *chromium-upgrade-branches - *chromium-upgrade-branches
jobs: jobs:
- linux-x64-checkout - linux-checkout-for-native-tests


# TODO(alexeykuzmin): Enable it back. # TODO(alexeykuzmin): Enable it back.
# Tons of crashes right now, see # Tons of crashes right now, see
# https://circleci.com/gh/electron/electron/67463 # https://circleci.com/gh/electron/electron/67463
# - linux-x64-browsertests: # - linux-x64-browsertests:
# requires: # requires:
# - linux-x64-checkout # - linux-checkout-for-native-tests


- linux-x64-unittests: - linux-x64-unittests:
requires: requires:
- linux-x64-checkout - linux-checkout-for-native-tests


- linux-x64-disabled-unittests: - linux-x64-disabled-unittests:
requires: requires:
- linux-x64-checkout - linux-checkout-for-native-tests


- linux-x64-checkout-no-patches - linux-checkout-for-native-tests-with-no-patches


- linux-x64-chromium-unittests: - linux-x64-chromium-unittests:
requires: requires:
- linux-x64-checkout-no-patches - linux-checkout-for-native-tests-with-no-patches
9 changes: 7 additions & 2 deletions DEPS
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ vars = {
'checkout_chromium': True, 'checkout_chromium': True,
'checkout_node': 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. # Python "requests" module is used for releases only.
'checkout_requests': False, 'checkout_requests': False,


Expand Down Expand Up @@ -64,8 +67,10 @@ deps = {
'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")), 'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")),
'condition': 'checkout_node', 'condition': 'checkout_node',
}, },
'src/electron/vendor/pyyaml': 'src/electron/vendor/pyyaml': {
(Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")), 'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
'condition': 'checkout_pyyaml',
},
'src/electron/vendor/boto': { 'src/electron/vendor/boto': {
'url': Var('boto_git') + '/boto.git' + '@' + Var('boto_version'), 'url': Var('boto_git') + '/boto.git' + '@' + Var('boto_version'),
'condition': 'checkout_boto', 'condition': 'checkout_boto',
Expand Down

0 comments on commit 9b05381

Please sign in to comment.