diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-10-04 11:54:50 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-04 11:54:50 +0100 |
commit | 2369bce159063b5528acb9f82a86bdd91a4c9944 (patch) | |
tree | a740996e05b50fbbd3e076deb59183d246b245bf | |
parent | Merge branch 'develop' into nightly (diff) | |
download | ferdium-app-2369bce159063b5528acb9f82a86bdd91a4c9944.tar.gz ferdium-app-2369bce159063b5528acb9f82a86bdd91a4c9944.tar.zst ferdium-app-2369bce159063b5528acb9f82a86bdd91a4c9944.zip |
Terminate build if no changes only if triggered by cron job
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 43e7fda20..26660a858 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -32,8 +32,10 @@ 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 | changes=$(git diff --stat HEAD origin/nightly | wc -l) | 35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) |
36 | if [ $changes -eq 0 ]; then | 36 | echo $TRAVIS_EVENT_TYPE |
37 | echo $changes | ||
38 | if [ $CHANGES_COUNT -eq 0 -a $TRAVIS_EVENT_TYPE == "cron" ]; then | ||
37 | travis_terminate 0; | 39 | travis_terminate 0; |
38 | else | 40 | else |
39 | git submodule update --remote --force | 41 | git submodule update --remote --force |