Skip to content

[comp] Production Deploy#2440

Merged
Marfuen merged 3 commits intoreleasefrom
main
Apr 2, 2026
Merged

[comp] Production Deploy#2440
Marfuen merged 3 commits intoreleasefrom
main

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 2, 2026

This is an automated pull request to release the candidate branch into production, which will trigger a deployment.
It was created by the [Production PR] action.

github-actions bot and others added 2 commits April 2, 2026 19:41
* fix: strip sslmode from DATABASE_URL to avoid conflict with explicit ssl option

PrismaPg receives both `sslmode=require` in the connection string and an
explicit `ssl` option. This double-SSL configuration can cause intermittent
connection failures on staging (ECS + RDS). Uses the URL API to safely
remove the sslmode param instead of the old buggy regex approach.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: exclude test files from tsc compilation in packages/db

The bun:test import in strip-ssl-mode.test.ts breaks the Docker build
which uses tsc (not bun) to compile packages/db.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: remove redundant prisma generate from Docker build

The @prisma/client is already generated by packages/db build step
(generate-prisma-client-js.js). The second prisma generate in the API
build step was redundant and failing with an empty error in Docker.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: update Trigger.dev extensions to copy entire schema directory

Both customPrismaExtension.ts files (api + app) now copy the full
multi-file schema directory instead of a single file. This ensures
prisma generate sees all model files, not just the generator/datasource.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: update Trigger.dev CI workflows for Prisma v7

- App workflows: run generate-prisma-client-js.js first to populate
  @prisma/client before the app's prisma generate
- API workflows: remove redundant prisma generate (already done by
  packages/db build step via generate-prisma-client-js.js)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@vercel
Copy link
Copy Markdown

vercel bot commented Apr 2, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
app (staging) Ready Ready Preview, Comment Apr 2, 2026 7:56pm
comp-framework-editor Ready Ready Preview, Comment Apr 2, 2026 7:56pm
1 Skipped Deployment
Project Deployment Actions Updated (UTC)
portal (staging) Skipped Skipped Apr 2, 2026 7:56pm

Request Review

@cursor
Copy link
Copy Markdown

cursor bot commented Apr 2, 2026

PR Summary

Medium Risk
Changes CI/CD steps and Prisma schema discovery logic used during Trigger.dev builds; mis-resolution or missing generation could break deploys or runtime DB access.

Overview
Simplifies the API Trigger.dev deploy workflows by stopping Prisma client generation during deploy and only copying Prisma model files into the API schema directory.

Updates the app Trigger.dev deploy workflows to generate Prisma clients explicitly, including running packages/db/scripts/generate-prisma-client-js.js before generating the app’s client from the copied multi-file schema.

Hardens customPrismaExtension in both apps/api and apps/app by expanding schema path discovery to try require.resolve for @trycompai/db, walk up node_modules, and fall back to common monorepo-relative paths while preserving candidate order and de-duping.

Written by Cursor Bugbot for commit 1bde775. This will update automatically on new commits. Configure here.

Replace naive path list with a 3-strategy fallback approach:

1. Node module resolution via require.resolve (follows workspace symlinks)
2. Walk up node_modules hierarchy from workingDir and workspaceDir
3. Relative monorepo paths as last resort

Each strategy checks both dist/schema.prisma (combined, from npm) and
prisma/schema/schema.prisma (source, in monorepo workspace).

Fixes: Trigger.dev deploy fails because combine-schemas.js is not part
of packages/db build, so dist/schema.prisma never exists in CI.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@vercel vercel bot temporarily deployed to staging – portal April 2, 2026 19:54 Inactive
@Marfuen Marfuen merged commit 11fcb75 into release Apr 2, 2026
12 checks passed
@claudfuen
Copy link
Copy Markdown
Contributor

🎉 This PR is included in version 3.14.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants