Merge pull request sarveshpro#4 from sarveshwarge/develop

Develop
wsolorza · Apr 20, 2020 · 67d3052 · 67d3052
2 parents f5d73cb + 0a91202
commit 67d3052
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/.github/workflows/testonheroku.yml b/.github/workflows/testonheroku.yml
@@ -0,0 +1,23 @@
+name: Test Heroku
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: sarveshwarge/[email protected] # This is the action
+        with:
+          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
+          heroku_app_name: ${{secrets.HEROKU_APP_NAME}}  #Must be unique in Heroku
+          heroku_email: ${{secrets.HEROKU_EMAIL}}
+          buildpack: ${{secrets.BUILDPACK}}
+          branch: ${{secrets.BRANCH_TO_TEST}}
+          dontuseforce: false #OPTIONAL and DEFAULT - false
+          usedocker: true #OPTIONAL and DEFAULT - false
+          appdir: "" #OPTIONAL and DEFAULT - "". This is useful if the api you're deploying is in a subfolder
+          docker_heroku_process_type: "web" #OPTIONAL and DEFAULT - "web"
diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 
 ![Docker](https://github.com/sarveshwarge/n8n-heroku/workflows/Docker/badge.svg) ![Test Heroku](https://github.com/sarveshwarge/n8n-heroku/workflows/Test%20Heroku/badge.svg)
 
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/sarveshwarge/n8n-heroku/tree/develop)
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/sarveshwarge/n8n-heroku)
 
 New method, just click, configure and get your n8n running.
-Also, now you can simply connect this Github repo and deploy, heroku uses default configuration from app.json
+Also, now set app stack to container and simply connect this Github repo and deploy, heroku uses default configuration from app.json
 
 default basic auth is user:pass
 

diff --git a/app.json b/app.json
@@ -41,9 +41,6 @@
         "options": {
           "version": "11"
         }
-      },
-      {
-        "plan": "papertrail:choklad"
       }
     ]
   }

diff --git a/heroku.yml b/heroku.yml
@@ -1,3 +1,13 @@
+setup:
+    addons:
+      - plan: heroku-postgresql
+        as: DATABASE
+
+    config:
+        N8N_BASIC_AUTH_ACTIVE: true
+        N8N_BASIC_AUTH_USER: user
+        N8N_BASIC_AUTH_PASSWORD: pass
+
 build:
     docker:
         web: Dockerfile
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,9 +41,6 @@ @@
             "options": {
               "version": "11"
             }
-          },
-          {
-            "plan": "papertrail:choklad"
           }
         ]
       }
@@ Expand Down @@