From 1ca7ab6a86742291d80d5c232040b283c1b753be Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 20 Jun 2018 15:13:39 +0200
Subject: [PATCH] Do not try to deploy if we are running a Docker build.

The deploy will be made in the docker itself.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9ee1919..ecd641b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,12 +43,13 @@ deploy:
     script: travis/deploy.sh
     on:
       tags: true
+      condition: $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1
   - provider: script
     skip_cleanup: true
     script: travis/deploy.sh
     on:
       branch: master
-      condition: $TRAVIS_EVENT_TYPE = cron
+      condition: $TRAVIS_EVENT_TYPE = cron && ( $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1 )
 env:
   global:
     - NIGHTLY_DATE=$(date +%Y-%m-%d)