From 9eb881b6edc3d2eca152390559cc68d6e61ee102 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Sun, 4 Oct 2020 13:02:56 +0100
Subject: Fine-tune nightly releases scripts

---
 .travis.yml       | 10 +++++++---
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 43e7fda20..56fc094e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,13 +32,15 @@ before_install:
       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
-      changes=$(git diff --stat HEAD origin/nightly | wc -l)
-      if [ $changes -eq 0 ]; then
+      CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l)
+      echo $TRAVIS_EVENT_TYPE
+      echo $changes
+      if [ $CHANGES_COUNT -eq 0 -a $TRAVIS_EVENT_TYPE == "cron" ]; then
         travis_terminate 0;
       else
         git submodule update --remote --force
         git add .
-        git commit -m "Update submodules"
+        git diff-index --quiet HEAD || git commit -m "Update submodules"
       fi
     fi
 install:
@@ -50,11 +52,13 @@ before_script:
 script:
   - |
     if [ $TRAVIS_BRANCH == "release" ]; then
+      echo "Building..."
       travis_retry travis_wait 100 npm run build 
     fi
   - |
     if [ $TRAVIS_BRANCH == "nightly" ]; then
       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
       if [ $TRAVIS_OS_NAME == "osx" ]; then
         git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1
diff --git a/package-lock.json b/package-lock.json
index 4d76226c5..2ec76b2c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.6.0-nightly.0",
+  "version": "5.6.0-nightly.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 95e6b1b85..2bc0c89c9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.0-nightly.0",
+  "version": "5.6.0-nightly.1",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
-- 
cgit v1.2.3-70-g09d2