Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds prisma data proxy #7706

Merged
merged 8 commits into from
Mar 15, 2023
Merged

Adds prisma data proxy #7706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac6284b
Adds prisma data proxy
zomars Mar 13, 2023
6cbccf9
Fix for pipeline
zomars Mar 13, 2023
2ab9af8
Update gh.env
zomars Mar 13, 2023
933e5dc
Update env-create-file.yml
zomars Mar 13, 2023
7400b57
Merge branch 'main' into prisma-data-proxy
PeerRich Mar 14, 2023
052bfbf
Reverts some changes
zomars Mar 14, 2023
f077ec2
Update turbo.json
zomars Mar 14, 2023
215da23
Update .env.example
zomars Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 **************************************************************************************************
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/env-create-file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion packages/prisma/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"pipeline": {
"@calcom/prisma#build": {
"cache": false,
"dependsOn": ["post-install", "db-deploy"],
"dependsOn": ["post-install"],
"outputs": []
},
"@calcom/prisma#db-migrate": {
Expand Down Expand Up @@ -48,7 +48,7 @@
},
"@calcom/web#start": {
"cache": false,
"dependsOn": ["@calcom/prisma#db-deploy"],
"dependsOn": [],
"outputs": []
},
"@calcom/website#build": {
Expand Down Expand Up @@ -242,6 +242,7 @@
"$PLAYWRIGHT_HEADLESS",
"$PLAYWRIGHT_TEST_BASE_URL",
"$PRISMA_FIELD_ENCRYPTION_KEY",
"$PRISMA_GENERATE_DATAPROXY",
"$QUICK",
"$RAILWAY_STATIC_URL",
"$SALESFORCE_CONSUMER_KEY",
Expand Down