From d3e3bc410e150e172f7833de9e7d9cdd78bab917 Mon Sep 17 00:00:00 2001
From: anthony <quereantho@gmail.com>
Date: Tue, 11 Jan 2022 17:37:09 +0100
Subject: [PATCH 1/3] :green_heart: Fix deployed heroku branch

---
 .circleci/config.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c58ff34..e83eecc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -118,6 +118,9 @@ jobs:
       heroku-app:
         default: ""
         type: string
+      branch:
+        default: "main"
+        type: string
     docker:
       - image: buildpack-deps:trusty
         auth:
@@ -127,7 +130,7 @@ jobs:
       - setup_dependencies
       - run:
           name: Heroku Deploy
-          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/<<parameters.heroku-app>>.git HEAD:main
+          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/<<parameters.heroku-app>>.git HEAD:<<parameters.branch>>
       - run:
           name: Smoke Test
           command: |
@@ -155,6 +158,7 @@ workflows:
           requires:
             - build
       - docker-build:
+          name: docker-build-prod
           tags: "latest $CIRCLE_BUILD_NUM"
           requires:
             - test
@@ -166,6 +170,7 @@ workflows:
                 - main
 
       - docker-build:
+          name: docker-build-dev
           tags: "dev $CIRCLE_BUILD_NUM-dev"
           requires:
             - test
@@ -177,7 +182,9 @@ workflows:
                 - develop
 
       - deploy-heroku:
+          name: heroku-deploy-prod
           heroku-app: *heroku-app-main
+          branch: main
           requires:
             - test
             - test-e2e
@@ -187,7 +194,9 @@ workflows:
               only:
                 - main
       - deploy-heroku:
+          name: heroku-deploy-dev
           heroku-app: *heroku-app-dev
+          branch: develop
           requires:
             - test
             - test-e2e

From 6b51ff7e2700813cf414fc525f5694b7f4f2ca27 Mon Sep 17 00:00:00 2001
From: anthony <quereantho@gmail.com>
Date: Tue, 11 Jan 2022 17:42:16 +0100
Subject: [PATCH 2/3] :green_heart: Re-Fix deployed heroku branch

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e83eecc..a05aaca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -130,7 +130,7 @@ jobs:
       - setup_dependencies
       - run:
           name: Heroku Deploy
-          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/<<parameters.heroku-app>>.git HEAD:<<parameters.branch>>
+          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/<<parameters.heroku-app>>.git HEAD:main
       - run:
           name: Smoke Test
           command: |

From c634d4ca3b8fa573217026d78029ada784d196f5 Mon Sep 17 00:00:00 2001
From: anthony <quereantho@gmail.com>
Date: Tue, 11 Jan 2022 17:50:39 +0100
Subject: [PATCH 3/3] :green_heart: Remove heroku branch parameter

---
 .circleci/config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a05aaca..b719a7e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -118,9 +118,6 @@ jobs:
       heroku-app:
         default: ""
         type: string
-      branch:
-        default: "main"
-        type: string
     docker:
       - image: buildpack-deps:trusty
         auth:
@@ -184,7 +181,6 @@ workflows:
       - deploy-heroku:
           name: heroku-deploy-prod
           heroku-app: *heroku-app-main
-          branch: main
           requires:
             - test
             - test-e2e
@@ -196,7 +192,6 @@ workflows:
       - deploy-heroku:
           name: heroku-deploy-dev
           heroku-app: *heroku-app-dev
-          branch: develop
           requires:
             - test
             - test-e2e