Index: .travis.yml |
diff --git a/.travis.yml b/.travis.yml |
index 1a877df6da3549b7530b3c2def2dbefb77f2aef5..5ca7669ffcf1320deebf2da45ccd571a92226f66 100644 |
--- a/.travis.yml |
+++ b/.travis.yml |
@@ -35,8 +35,10 @@ before_install: |
- export PATH=`pwd`/depot_tools:"$PATH" |
# Checkout everything if we're building the SDK |
- - 'gclient config --spec=''solutions = [ { "name": ".", "url": "git@github.com:dart-lang/sdk.git", "deps_file": "DEPS", "managed": False, "custom_vars": { "dart_root": "." } } ]''' |
- - if [ "$CXX" ]; then gclient sync ; fi |
+ - cd .. |
+ - 'gclient config --spec=''solutions = [ { "name": "sdk", "url": "git@github.com:dart-lang/sdk.git", "deps_file": "DEPS", "managed": False } ]''' |
+ - gclient sync |
+ - cd sdk |
# If a C++ compiler is set, built the SDK - else keep the preinstalled. |
- if [ "$CXX" ]; then ./tools/build.py -m release create_sdk ; fi |
@@ -54,6 +56,9 @@ before_script: |
- nvm install 5.5.0 |
- npm install |
script: |
+ # Clear any local packages/.packages in favor of the one at SDK root |
+ - pub get --no-packages-dir |
+ - rm -f .packages |
vsm
2016/09/28 15:42:19
Note, I'm doing these steps basic the dart-travis
|
# Run DDC tests |
- if [[ -z "$TEST" ]]; then ./tool/presubmit.sh ; fi |
- if [[ "$TEST" == coverage ]]; then ./tool/build_sdk.sh && ./tool/coverage.sh ; fi |