Merge branch 'main' into develop

team-peekabook · Feb 1, 2024 · 2ee49c0 · 2ee49c0
2 parents a68913e + fd3b9dc
commit 2ee49c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,9 +2,9 @@ name: deploy
 
 on:
   push:
-    branches: [develop]
+    branches: [main]
   pull_request:
-    branches: [develop]
+    branches: [main]
 
 jobs:
   build-and-deploy:
@@ -29,14 +29,15 @@ jobs:
           pwd
           touch .env
           echo DATABASE_URL=${{ secrets.DATABASE_URL }} >>.env 
-          echo WEBHOOK_URL=${{ secrets.WEBHOOK_URL }} >> .env
           echo JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} >> .env
           echo MANAGER_EMAIL=${{ secrets.MANAGER_EMAIL }} >>.env 
           echo MANAGER_PASSWORD=${{ secrets.MANAGER_PASSWORD }} >> .env
           echo S3_ACCESS_KEY=${{ secrets.S3_ACCESS_KEY }} >>.env 
           echo S3_SECRET_KEY=${{ secrets.S3_SECRET_KEY }} >>.env 
           echo S3_BUCKET=${{ secrets.S3_BUCKET }} >>.env
           echo TEST_ACCESS_TOKEN=${{ secrets.TEST_ACCESS_TOKEN}} >>.env
+          echo WEBHOOK_URL_ERROR=${{ secrets.WEBHOOK_URL_ERROR}} >>.env
+          echo WEBHOOK_URL_SIGNUP=${{ secrets.WEBHOOK_URL_SIGNUP}} >> .env
           cat .env
 
       - name: build server files

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -38,7 +38,6 @@ model Book {
   bookImage String?     @db.VarChar(500)
   publisher String      @db.VarChar(50)
   Bookshelf Bookshelf[]
-  Recommend Recommend[]
 }
 
 model Bookshelf {