From 6aeae690eb863fdb7418328cb5d24d9bfd46065f Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Wed, 6 Jan 2021 07:02:20 +0100
Subject: 5.6.0-nightly.13

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d5f1dd0c0..80b9dedd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ before_install:
     if [ $TRAVIS_BRANCH == "nightly" ]; then
       git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1
       git fetch source
-      git merge --no-ff --commit --no-edit source/develop
+      git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop
       CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l)
       echo $TRAVIS_EVENT_TYPE
       echo $changes
@@ -40,7 +40,7 @@ before_install:
       else
         git submodule update --remote --force
         git add .
-        git diff-index --quiet HEAD || git commit -m "Update submodules"
+        git commit -m "Update submodules [skip ci]" || true
       fi
     fi
 install:
@@ -57,6 +57,8 @@ script:
     fi
   - |
     if [ $TRAVIS_BRANCH == "nightly" ]; then
+      git add .
+      git commit -m "Apply linter fixes [skip ci]"
       npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]"
       echo "Building..."
       travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
-- 
cgit v1.2.3-54-g00ecf