From e4837c8586004c580a003d05f7a677094d94b09c Mon Sep 17 00:00:00 2001
From: Surabhi Sharma <surabhisharma.226005@gmail.com>
Date: Fri, 28 Jul 2017 20:18:03 +0530
Subject: [PATCH] Integrate heroku in travis setup

---
 .travis.yml |  2 +-
 travis.sh   | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aff24cf1..dc03e5e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,4 @@ deploy:
     secure: $TRAVIS_SECURE_API_KEY
 after_success:
   - if [ "$TRAVIS_BRANCH" == "develop" ] ; then 
-    if [ "$TRAVIS_PULL_REQUEST" == "true" ] ; then bash travis.sh ; fi ; fi
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ] ; then bash travis.sh ; fi ; fi
diff --git a/travis.sh b/travis.sh
index b111dc47..f21e2aa5 100644
--- a/travis.sh
+++ b/travis.sh
@@ -8,12 +8,28 @@
 git config --global user.name "$GIT_USER_NAME"
 git config --global user.email $GIT_USER_EMAIL
 
+# Install the Heroku gem (or the Heroku toolbelt)
+gem install $PROVIDER
+# Add your Heroku git repo:
 git remote rm $PROVIDER ; 
 git remote add $PROVIDER git@$PROVIDER.com:$PROVIDER_APP_NAME.git ;
+# Add your Heroku API key:
+export HEROKU_API_KEY=$HEROKU_API_KEY
+# Turn off warnings about SSH keys:
+echo "   Host heroku.com" >> ~/.ssh/config
+echo "   StrictHostKeyChecking no" >> ~/.ssh/config
+echo "   CheckHostIP no" >> ~/.ssh/config
+echo "   UserKnownHostsFile=/dev/null" >> ~/.ssh/config
+# Clear your current Heroku SSH keys:
+$PROVIDER keys:clear
+# Add a new SSH key to Heroku
+yes | $PROVIDER keys:add
 
 git add dist/ ;
-git checkout -b $TRAVIS_BRANCH ;
+git checkout -b $NEW_TRAVIS_BRANCH ;
 git commit -m "$TRAVIS_COMMIT_MESSAGE" ;
-git push $PROVIDER $TRAVIS_BRANCH:PROVIDER_BRANCH ;
+# Push to Heroku!
+yes | git push --force $PROVIDER $NEW_TRAVIS_BRANCH:$PROVIDER_BRANCH ;
 
-echo -e "yes" | ./travis.sh ; fi
+
+# echo -e "yes" | ./travis.sh