diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-10-04 01:58:42 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-04 01:58:42 +0100 |
commit | 42d06805f683a9ffb2f2f167b3629afdd6a69cd5 (patch) | |
tree | 3d0259b155eec4f073c6c28a3fa99d45f76743f1 | |
parent | Merge branch 'develop' into nightly (diff) | |
download | ferdium-app-42d06805f683a9ffb2f2f167b3629afdd6a69cd5.tar.gz ferdium-app-42d06805f683a9ffb2f2f167b3629afdd6a69cd5.tar.zst ferdium-app-42d06805f683a9ffb2f2f167b3629afdd6a69cd5.zip |
Terminate nightly build if there is no changes from develop
-rw-r--r-- | .travis.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 58a6409b8..43e7fda20 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -32,9 +32,14 @@ before_install: | |||
32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
33 | git fetch source | 33 | git fetch source |
34 | git merge --no-ff --commit --no-edit source/develop | 34 | git merge --no-ff --commit --no-edit source/develop |
35 | git submodule update --remote --force | 35 | changes=$(git diff --stat HEAD origin/nightly | wc -l) |
36 | git add . | 36 | if [ $changes -eq 0 ]; then |
37 | git commit -m "Update submodules" | 37 | travis_terminate 0; |
38 | else | ||
39 | git submodule update --remote --force | ||
40 | git add . | ||
41 | git commit -m "Update submodules" | ||
42 | fi | ||
38 | fi | 43 | fi |
39 | install: | 44 | install: |
40 | - cd recipes && npm install && npm run package && cd .. | 45 | - cd recipes && npm install && npm run package && cd .. |