diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2020-10-13 12:32:15 +0100 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-13 12:32:15 +0100 |
| commit | 98764c9534b6c7cfad9d53553b229458c24c0174 (patch) | |
| tree | dce8c73a97cca8e3677dac570a2fa42ed82a875b /.travis.yml | |
| parent | 5.6.0-nightly.7 and trigger AppVeyor nightly build [skip travisci] (diff) | |
| download | ferdium-app-98764c9534b6c7cfad9d53553b229458c24c0174.tar.gz ferdium-app-98764c9534b6c7cfad9d53553b229458c24c0174.tar.zst ferdium-app-98764c9534b6c7cfad9d53553b229458c24c0174.zip | |
Skip ci on merge commit
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1388d71ae..b52c77bdc 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -31,7 +31,7 @@ before_install: | |||
| 31 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 31 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
| 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 -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop |
| 35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) | 35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) |
| 36 | echo $TRAVIS_EVENT_TYPE | 36 | echo $TRAVIS_EVENT_TYPE |
| 37 | echo $changes | 37 | echo $changes |