From 8b5715acffcfdebfac6f0e60edd0f2a10f36834f Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 20 Jun 2018 15:11:27 +0200 Subject: [PATCH 1/2] Revert "Do not deploy on native_dyn linux platform." This reverts commit 8db9def67d99a8649a9b3215dd9555173bb6ef07. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c45c45..9ee1919 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,13 +43,12 @@ deploy: script: travis/deploy.sh on: tags: true - condition: $TRAVIS_OS_NAME = osx || $PLATFORM != native_dyn - provider: script skip_cleanup: true script: travis/deploy.sh on: branch: master - condition: $TRAVIS_EVENT_TYPE = cron && ($TRAVIS_OS_NAME = osx || $PLATFORM != native_dyn) + condition: $TRAVIS_EVENT_TYPE = cron env: global: - NIGHTLY_DATE=$(date +%Y-%m-%d) From 1ca7ab6a86742291d80d5c232040b283c1b753be Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 20 Jun 2018 15:13:39 +0200 Subject: [PATCH 2/2] 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)