From 396e4be5b3209015fe14a971a28b91b86c584531 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Fri, 12 Feb 2021 19:27:33 +0000
Subject: [PATCH] Fix deploy job and put into workflow

---
 .circleci/config.yml | 49 +++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b4326a..b0db2be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,15 @@
 version: 2
+workflows: # Define a Workflow running the build job, then the deploy job
+  version: 2
+  build-deploy:
+    jobs:
+      - build
+      - deploy:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master # Only deploys when the commit is on the Master branch
 jobs:
  build:
    machine: true
@@ -7,22 +18,22 @@ jobs:
      - run: |
          bash bin/run-tests-with-docker.sh
          
-# https://github.com/circleci/circleci-docs/blob/master/jekyll/_cci1/continuous-deployment-with-heroku.md
-deployment:
-  production:
-    branch: master
-    commands:
-      - |
-        cat >~/.netrc <<EOF
-        machine api.heroku.com
-          login $HEROKU_EMAIL
-          password $HEROKU_TOKEN
-        machine git.heroku.com
-          login $HEROKU_EMAIL
-          password $HEROKU_TOKEN
-        EOF
-      - chmod 600 ~/.netrc # Heroku cli complains about permissions without this
-      - heroku git:remote -a wrestlingapp
-      - git push heroku master
-      - sleep 20s
-      - heroku run rake db:migrate --app wrestlingapp
\ No newline at end of file
+ # https://github.com/circleci/circleci-docs/blob/master/jekyll/_cci1/continuous-deployment-with-heroku.md
+ deploy:
+   machine: true
+   steps:
+     - checkout
+     - run: |
+         cat >~/.netrc <<EOF
+         machine api.heroku.com
+           login $HEROKU_EMAIL
+           password $HEROKU_TOKEN
+         machine git.heroku.com
+           login $HEROKU_EMAIL
+           password $HEROKU_TOKEN
+         EOF
+         chmod 600 ~/.netrc # Heroku cli complains about permissions without this
+         heroku git:remote -a wrestlingapp
+         git push heroku master
+         sleep 20s
+         heroku run rake db:migrate --app wrestlingapp
\ No newline at end of file