From cbd809e6d12277478f3b4320c2049ec95fa257d1 Mon Sep 17 00:00:00 2001
From: fontaipi <39625044+fontaipi@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:34:59 +0100
Subject: [PATCH 1/4] Update config.yml

---
 .circleci/config.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dd8f9d1..0fc5a2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,7 +54,7 @@ jobs:
           at: /tmp
       - run:
           name: Deploy app
-          command: echo todo && false
+          command: echo todo
   back-test-unit:
     docker:
       - image: circleci/node:dubnium-browsers
@@ -121,10 +121,15 @@ jobs:
       - checkout
       - run:
           name: Heroku Deploy
-          command: echo todo && false
+          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:master
       - run:
           name: Smoke Test
-          command: echo todo && false
+          command: |
+            if [[ "$HTTPCODE" -ne 200 ]]; then
+              echo "heroku app not responding, failing deploy" \
+              exit 1 \
+              HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/`
+            fi
 
 workflows:
   version: 2

From b1e96f38108effdfc9d404fb7694f6ca5e9e57f7 Mon Sep 17 00:00:00 2001
From: fontaipi <39625044+fontaipi@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:47:17 +0100
Subject: [PATCH 2/4] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0fc5a2f..625ec46 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -125,10 +125,10 @@ jobs:
       - run:
           name: Smoke Test
           command: |
+            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/` \
             if [[ "$HTTPCODE" -ne 200 ]]; then
               echo "heroku app not responding, failing deploy" \
               exit 1 \
-              HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/`
             fi
 
 workflows:

From 04b7459e25914571457ccb6bbc57b2612c116142 Mon Sep 17 00:00:00 2001
From: fontaipi <39625044+fontaipi@users.noreply.github.com>
Date: Tue, 1 Dec 2020 17:03:29 +0100
Subject: [PATCH 3/4] Update config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 625ec46..6f2bd2e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -121,14 +121,14 @@ jobs:
       - checkout
       - run:
           name: Heroku Deploy
-          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:master
+          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:main
       - run:
           name: Smoke Test
           command: |
-            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/` \
             if [[ "$HTTPCODE" -ne 200 ]]; then
               echo "heroku app not responding, failing deploy" \
-              exit 1 \
+              exit 1; \
+              HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/`
             fi
 
 workflows:

From 7833b9dc179ecf13bd864942e0f03f3988c0db93 Mon Sep 17 00:00:00 2001
From: fontaipi <39625044+fontaipi@users.noreply.github.com>
Date: Tue, 1 Dec 2020 17:03:59 +0100
Subject: [PATCH 4/4] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6f2bd2e..fd8675a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -125,10 +125,10 @@ jobs:
       - run:
           name: Smoke Test
           command: |
+            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/` \
             if [[ "$HTTPCODE" -ne 200 ]]; then
               echo "heroku app not responding, failing deploy" \
               exit 1; \
-              HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/`
             fi
 
 workflows: