From acc1cc3158d378d8774921a42964e910d6352f77 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 29 Sep 2016 00:10:29 -0400
Subject: [PATCH] travis-ci fix s3 deploy (#5564)

- deploy all branches to s3
---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd30924df8..9dfb31b8c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,13 +69,13 @@ script:
 
 after_success:
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-      make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/;
-      find . -type f -name 'nuttx-*-default.px4' -exec cp "{}" . \;
-      find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4;
-      mkdir s3deploy-branch && mv *_default.px4 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/;
-      if [[ "$GCC_VER" == "4.8" && ( "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "beta" || "$TRAVIS_BRANCH" == "stable" ) ]]; then
-        export PX4_S3_DEPLOY=1;
-      fi
+         make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/
+      && find . -type f -name 'nuttx-*-default.px4' -exec cp "{}" . \;
+      && find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4
+      && mkdir s3deploy-branch && mv *_default.px4 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/;
+    fi
+  - if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "4.8" ]]; then
+      export PX4_S3_DEPLOY=1;
     fi
 
 deploy: