diff options
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a120aae49..43e7fda20 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -27,6 +27,20 @@ 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 remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | ||
33 | git fetch source | ||
34 | git merge --no-ff --commit --no-edit source/develop | ||
35 | changes=$(git diff --stat HEAD origin/nightly | wc -l) | ||
36 | if [ $changes -eq 0 ]; then | ||
37 | travis_terminate 0; | ||
38 | else | ||
39 | git submodule update --remote --force | ||
40 | git add . | ||
41 | git commit -m "Update submodules" | ||
42 | fi | ||
43 | fi | ||
30 | install: | 44 | install: |
31 | - cd recipes && npm install && npm run package && cd .. | 45 | - cd recipes && npm install && npm run package && cd .. |
32 | - travis_retry npx lerna bootstrap | 46 | - travis_retry npx lerna bootstrap |
@@ -40,7 +54,7 @@ script: | |||
40 | fi | 54 | fi |
41 | - | | 55 | - | |
42 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 56 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
43 | npm version prerelease --preid=nightly -m "%s [skip ci]" | 57 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
44 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 58 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |
45 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 59 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
46 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 60 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |