Merge pull request #1142 from trycompai/main

[comp] Production Deploy

Author: Marfuen

.github/workflows/database-migrations-main.yml

@@ -1,4 +1,4 @@
-name: Database Migrations Dev
+name: Database Migrations Main
 on:
   push: # Runs AFTER merge to main (never during PR review!)
     branches:
@@ -11,9 +11,18 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun install
+
       - name: Apply database migrations
         env:
           DATABASE_URL: ${{ secrets.DATABASE_URL_DEV }}
         run: |
           cd packages/db
-          npx prisma migrate deploy
+          bunx prisma migrate deploy

.github/workflows/database-migrations-release.yml

@@ -1,4 +1,4 @@
-name: Database Migrations Prod
+name: Database Migrations Release
 on:
   push: # Runs AFTER merge to release (never during PR review!)
     branches:
@@ -11,9 +11,18 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun install
+
       - name: Apply database migrations
         env:
           DATABASE_URL: ${{ secrets.DATABASE_URL_PROD }}
         run: |
           cd packages/db
-          npx prisma migrate deploy
+          bunx prisma migrate deploy

.github/workflows/trigger-tasks-deploy-main.yml

@@ -24,10 +24,11 @@ jobs:
         run: bunx prisma generate
       - name: 🚀 Deploy Trigger.dev
         working-directory: ./apps/app
+        timeout-minutes: 20
         env:
           TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
           VERCEL_ACCESS_TOKEN: ${{ secrets.VERCEL_ACCESS_TOKEN }}
           VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
           VERCEL_TEAM_ID: ${{ secrets.VERCEL_TEAM_ID }}
-        run: bunx trigger.dev@latest deploy --env staging
+        run: bunx trigger.dev@latest deploy --env staging --log-level debug

.gitignore

@@ -78,4 +78,7 @@ debug-setup-page.png
 
 .playground/
 
-packages/*/dist
+packages/*/dist
+
+# Generated Prisma Client
+**/src/db/generated/

Dockerfile

@@ -36,7 +36,7 @@ WORKDIR /app
 COPY packages/db/prisma ./packages/db/prisma
 
 # Create minimal package.json for Prisma
-RUN echo '{"name":"migrator","type":"module","dependencies":{"prisma":"^6.9.0","@prisma/client":"^6.9.0"}}' > package.json
+RUN echo '{"name":"migrator","type":"module","dependencies":{"prisma":"^6.13.0","@prisma/client":"^6.13.0"}}' > package.json
 
 # Install ONLY Prisma dependencies
 RUN bun install

apps/app/.eslintrc.json

@@ -1,9 +1,10 @@
 {
-  "extends": "next/core-web-vitals",
+  "extends": ["next/core-web-vitals"],
+  "ignorePatterns": ["src/db/generated/**"],
   "rules": {
-    "react/no-unescaped-entities": "off",
+    "react-hooks/rules-of-hooks": "error",
     "react-hooks/exhaustive-deps": "warn",
-    "react-hooks/rules-of-hooks": "warn",
+    "react/no-unescaped-entities": "off",
     "react/display-name": "off"
   }
 }

apps/app/.gitignore

@@ -49,3 +49,8 @@ next-env.d.ts
 
 # Sentry Config File
 .env.sentry-build-plugin
+
+# Generated Prisma Client
+prisma/generated
+# Copied schema from @trycompai/db package - always generate fresh
+prisma/schema.prisma

apps/app/.prettierignore

@@ -1,4 +1,7 @@
 # Playwright test artifacts
 playwright-report/
 test-results/
-.playwright/ 
+.playwright/
+
+# Generated Prisma Client
+src/db/generated/