From a6794b123af288ba47c6acd7b195a7f94c6c88e2 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Tue, 9 May 2017 15:22:00 -0700
Subject: [PATCH] Revert "Fix travis deploy for PRs redux"

---
 .travis.yml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4d720c00c..a5477329ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -216,23 +216,12 @@ matrix:
           - /root/travis_bootstrap
           - /hab/studios/home--travis--build--habitat-sh
           - /root/.cargo
-      script:
+      before_install:
         - ./support/ci/fast_pass.sh || exit 0
-      before_deploy:
         - if [[ ! -x ./support/ci/deploy.sh ]]; then chmod +x ./support/ci/deploy.sh; fi
         - openssl aes-256-cbc -K $encrypted_50e90ce07941_key -iv $encrypted_50e90ce07941_iv -in ./support/ci/habitat-srv-admin.enc -out /tmp/habitat-srv-admin -d
-      deploy:
-        # This is split into two because tags overrides branch setting
-        - provider: script
-          script:
-            - sudo ./support/ci/deploy.sh
-          on:
-            branch: master
-        - provider: script
-          script:
-            - sudo ./support/ci/deploy.sh
-          on:
-            tags: true
+      script:
+        - sudo ./support/ci/deploy.sh
 notifications:
   webhooks:
     urls: