From 5cfa7dc76dc2af761a6688fd911ddd55322a940c Mon Sep 17 00:00:00 2001
From: Mossroy <mossroy@mossroy.fr>
Date: Fri, 2 Jun 2017 08:24:52 +0200
Subject: [PATCH] Fix .travis.yml to generate packages for both nightly and
 tags.

Fixes #245
---
 .travis.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 973682bbb..8b5fbbd59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,10 @@ script:
     - pkill node
 deploy:
     provider: script
-    script: "./scripts/setup_travis_env.sh && DISPLAY=:99.0 ./scripts/create_all_packages.sh"
+    # This deployment handles 2 different cases :
+    # - the nightly builds (launched by cron)
+    # - the generation of packages for public releases (launched by a tag)
+    # In both cases, we run the same script, but with different command-line arguments
+    script: if [ "${TRAVIS_TAG}aa" = "aa" ]; then CMD_ARGS=""; else CMD_ARGS="-t -v ${TRAVIS_TAG}"; fi && ./scripts/setup_travis_env.sh && DISPLAY=:99.0 ./scripts/create_all_packages.sh $CMD_ARGS
     on:
-        condition: ( "$TRAVIS_EVENT_TYPE" = "cron" )
-deploy:
-    provider: script
-    script: "./scripts/setup_travis_env.sh && DISPLAY=:99.0 ./scripts/create_all_packages.sh -t -v $TRAVIS_TAG"
-    on:
-        tags: true
+        condition: ( "$TRAVIS_EVENT_TYPE" = "cron" || "${TRAVIS_TAG}bb" != "bb" )