From 813ddbdf1309059794d42ac2f842623b57d231b2 Mon Sep 17 00:00:00 2001
From: Xavier MALPARTY <xavier@nimblehq.co>
Date: Thu, 2 Sep 2021 11:04:23 +0700
Subject: [PATCH 1/4] [#2] Rename Heroku application names in github workflow

---
 .github/workflows/deploy_heroku.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_heroku.yml b/.github/workflows/deploy_heroku.yml
index dd010c4..b6a9c52 100644
--- a/.github/workflows/deploy_heroku.yml
+++ b/.github/workflows/deploy_heroku.yml
@@ -42,9 +42,9 @@ jobs:
         run: |
           if [[ $BRANCH_TAG = "latest" ]]
           then
-            echo "HEROKU_APP=rails_view_component_blog" >> $GITHUB_ENV
+            echo "HEROKU_APP=view-component-blog" >> $GITHUB_ENV
           else
-            echo "HEROKU_APP=rails_view_component_blog-staging" >> $GITHUB_ENV
+            echo "HEROKU_APP=view-component-blog-staging" >> $GITHUB_ENV
           fi
 
       - name: Login to Docker registry

From 3cf1d76d0721be20a4986aceb4f334d8b478d937 Mon Sep 17 00:00:00 2001
From: Xavier MALPARTY <xavier@nimblehq.co>
Date: Thu, 2 Sep 2021 11:09:59 +0700
Subject: [PATCH 2/4] [#2] Update workflow to run on push for testing purpose

---
 .github/workflows/deploy_heroku.yml | 12 +-----------
 db/schema.rb                        | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 db/schema.rb

diff --git a/.github/workflows/deploy_heroku.yml b/.github/workflows/deploy_heroku.yml
index b6a9c52..acb208b 100644
--- a/.github/workflows/deploy_heroku.yml
+++ b/.github/workflows/deploy_heroku.yml
@@ -1,16 +1,6 @@
 name: Deploy Heroku
 
-on:
-  workflow_run:
-    workflows:
-      - Test
-    branches:
-      - master
-      - main
-      - development
-    types:
-      - completed
-  workflow_dispatch:
+on: push
 
 env:
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000..4603022
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,18 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 0) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+end

From 157f3b47ab17c892185f2c1114bee6a44639b103 Mon Sep 17 00:00:00 2001
From: Xavier MALPARTY <xavier@nimblehq.co>
Date: Thu, 2 Sep 2021 11:26:23 +0700
Subject: [PATCH 3/4] [#2] Update Docker Registry token in DeployHeroku
 workflow

---
 .github/workflows/deploy_heroku.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_heroku.yml b/.github/workflows/deploy_heroku.yml
index acb208b..25f931e 100644
--- a/.github/workflows/deploy_heroku.yml
+++ b/.github/workflows/deploy_heroku.yml
@@ -5,7 +5,7 @@ on: push
 env:
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}
   DOCKER_REGISTRY_USERNAME: ${{ github.repository_owner }}
-  DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+  DOCKER_REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   DOCKER_IMAGE: ${{ github.repository }}
   HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
 

From bc68fe28607eb7d3fb02532fead8a7db6e0e314c Mon Sep 17 00:00:00 2001
From: Xavier MALPARTY <xavier@nimblehq.co>
Date: Thu, 2 Sep 2021 12:01:18 +0700
Subject: [PATCH 4/4] [#2] Revert deploy heroku push condition as tests are
 completed

---
 .github/workflows/deploy_heroku.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_heroku.yml b/.github/workflows/deploy_heroku.yml
index 25f931e..a164a3c 100644
--- a/.github/workflows/deploy_heroku.yml
+++ b/.github/workflows/deploy_heroku.yml
@@ -1,6 +1,16 @@
 name: Deploy Heroku
 
-on: push
+on:
+  workflow_run:
+    workflows:
+      - Test
+    branches:
+      - master
+      - main
+      - development
+    types:
+      - completed
+  workflow_dispatch:
 
 env:
   DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }}