From f20d78bec1aff8827fe49ba2b3206d8d7a8a64db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Omar=20L=C3=B3pez?= Date: Wed, 15 Mar 2023 13:33:54 -0700 Subject: [PATCH] Adds prisma data proxy (#7706) * Adds prisma data proxy * Fix for pipeline * Update gh.env * Update env-create-file.yml * Reverts some changes * Update turbo.json * Update .env.example --------- Co-authored-by: Peer Richelsen --- .env.example | 4 ++++ .github/workflows/env-create-file.yml | 1 + packages/prisma/package.json | 1 - turbo.json | 5 +++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index d1492290c4..bbe18b86bc 100644 --- a/.env.example +++ b/.env.example @@ -22,6 +22,10 @@ CALCOM_LICENSE_KEY= # - DATABASE ************************************************************************************************ DATABASE_URL="postgresql://postgres:@localhost:5450/calendso" +# Opt-in to a dedicated connection pool for Prisma using Prisma Data Proxy +# Cold boots will be faster and you will be able to scale your DB independently of your application. +# @see https://www.prisma.io/docs/data-platform/data-proxy/use-data-proxy +PRISMA_GENERATE_DATAPROXY=false # *********************************************************************************************************** # - SHARED ************************************************************************************************** diff --git a/.github/workflows/env-create-file.yml b/.github/workflows/env-create-file.yml index 7b3f084303..920fd33810 100644 --- a/.github/workflows/env-create-file.yml +++ b/.github/workflows/env-create-file.yml @@ -39,6 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: ./.github/actions/dangerous-git-checkout - uses: ozaytsev86/create-env-file@v1 with: file-name: ${{ github.workspace }}/gh.env diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 36e268331d..047c11436c 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -3,7 +3,6 @@ "version": "0.0.0", "private": true, "scripts": { - "build": "yarn prisma migrate deploy", "clean": "rm -rf .turbo && rm -rf node_modules", "db-deploy": "yarn prisma migrate deploy", "db-migrate": "yarn prisma migrate dev", diff --git a/turbo.json b/turbo.json index d1f067ddfc..de3551bcc5 100644 --- a/turbo.json +++ b/turbo.json @@ -3,7 +3,7 @@ "pipeline": { "@calcom/prisma#build": { "cache": false, - "dependsOn": ["post-install", "db-deploy"], + "dependsOn": ["post-install"], "outputs": [] }, "@calcom/prisma#db-migrate": { @@ -48,7 +48,7 @@ }, "@calcom/web#start": { "cache": false, - "dependsOn": ["@calcom/prisma#db-deploy"], + "dependsOn": [], "outputs": [] }, "@calcom/website#build": { @@ -242,6 +242,7 @@ "$PLAYWRIGHT_HEADLESS", "$PLAYWRIGHT_TEST_BASE_URL", "$PRISMA_FIELD_ENCRYPTION_KEY", + "$PRISMA_GENERATE_DATAPROXY", "$QUICK", "$RAILWAY_STATIC_URL", "$SALESFORCE_CONSUMER_KEY",