Merge branch 'travis'

Author: christopherthielen

.travis.yml

@@ -7,18 +7,18 @@ install: yarn --check-files
 before_script: greenkeeper-lockfile-update && greenkeeper-lockfile-upload
 script:
 # If CORE_BRANCH is set, fetch and build the @uirouter/core branch from github, then install it
-- if [ "x${CORE_BRANCH}x" != "xx" ] ; then ./node_modules/.bin/publish_yalc_package ui-router-core https://github.com/ui-router/core.git && yalc add @uirouter/core ; fi
+- if [ "x${CORE_BRANCH}x" != "xx" ] ; then ./node_modules/.bin/publish_yalc_package .downstream_cache/core https://github.com/ui-router/core.git && yalc add @uirouter/core ; fi
 # If DOWNSTREAM or DOWNSTREAM_PKGS is set, run downstream packages' tests instead
 - if [ "x${DOWNSTREAM_PKGS}${DOWNSTREAM}x" != "xx" ] ; then npm run test:downstream ; else tsc && npm test ; fi
 
 env:
   global:
     secure: TanWbkSRljYf0ENPiF3LDM+6RDYyUZoVIIQjUk9UDZ1MBvzEiqISB/zKSXSoYY1JNZpNcXgje2Sl08yGhAugRVodH+FJa/khSkXwRsZAlJuG8qPFAevW4gffvJvPAE7O0uy4jLyyu+Fi9dptdi1zDGsOps/Q+WURH9jWPGmQpj8=
   matrix:
-  - CORE_BRANCH=master
   - CORE_BRANCH=
-  - DOWNSTREAM=true
+  - CORE_BRANCH=master
   - CORE_BRANCH=master UPSTREAM_PKGS=@uirouter/core DOWNSTREAM=true
+  - DOWNSTREAM=true
 
 matrix:
   fast_finish: true
@@ -38,4 +38,3 @@ cache:
   directories:
   - .downstream_cache
   - node_modules
-  - ui-router-core