diff options
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 6075d2d47..a62b086c8 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -27,6 +27,12 @@ cache: npm | |||
27 | 27 | ||
28 | before_install: | 28 | before_install: |
29 | - git submodule update --init --recursive | 29 | - git submodule update --init --recursive |
30 | - | | ||
31 | if [ $TRAVIS_BRANCH == "nightly"]; then | ||
32 | git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* | ||
33 | git fetch | ||
34 | git merge --no-ff origin/develop | ||
35 | fi | ||
30 | install: | 36 | install: |
31 | - cd recipes && npm install && npm run package && cd .. | 37 | - cd recipes && npm install && npm run package && cd .. |
32 | - travis_retry npx lerna bootstrap | 38 | - travis_retry npx lerna bootstrap |