Merge branch 'main' of github.com:thedevdojo/wave into main

radosslav · Apr 4, 2021 · 4d62ecd · 4d62ecd
2 parents 633f64c + 52ee8e0
commit 4d62ecd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/.do/app.yaml b/.do/app.yaml
@@ -1,9 +1,10 @@
 name: wave
 services:
 - name: web
-  git:
+  github:
+    repo: thedevdojo/wave
     branch: main
-    repo_clone_url: https://github.com/thedevdojo/wave.git
+    deploy_on_push: true
   run_command: php artisan migrate --force ; heroku-php-apache2 public/
   envs:
   - key: APP_NAME
@@ -123,13 +124,18 @@ services:
     scope: RUN_TIME
     value: "YOUR_DO_SPACES_BUCKET"
 databases:
-- name: wave-db
+- engine: PG
+  name: wave-db
+  num_nodes: 1
+  size: db-s-dev-database
+  version: "12"
 jobs:
 - name: migrate
   kind: POST_DEPLOY
-  git:
-    repo_clone_url: https://github.com/thedevdojo/wave.git
+  github:
+    repo: thedevdojo/wave
     branch: main
+    deploy_on_push: true
   run_command: php artisan migrate --seed ; php artisan storage:link
   envs:
   - key: APP_NAME

diff --git a/deploy.json b/deploy.json
@@ -4,9 +4,10 @@
         "services": [
             {
                 "name": "web",
-                "git": {
-                    "repo_clone_url": "https://github.com/${wave.repo}.git",
-                    "branch": "main"
+                "github": {
+                    "repo": "${wave.repo}",
+                    "branch": "main",
+                    "deploy_on_push": true
                 },
                 "run_command": "php artisan migrate --force ; heroku-php-apache2 public/",
                 "envs": [
@@ -199,9 +200,10 @@
         "jobs": [
             {
                 "name": "migrate",
-                "git": {
-                    "repo_clone_url": "https://github.com/${wave.repo}.git",
-                    "branch": "main"
+                "github": {
+                    "repo": "${wave.repo}",
+                    "branch": "main",
+                    "deploy_on_push": true
                 },
                 "run_command": "php artisan migrate --seed ; php artisan storage:link",
                 "envs": [
@@ -276,4 +278,4 @@
             }
         ]
     }
-}
+}