Skip to content

Commit 6e44c94

Browse files
Merge branch 'main' into perf/remove-unused-apis
2 parents def5ceb + 6932498 commit 6e44c94

280 files changed

Lines changed: 6618 additions & 4526 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
/apps/api/**/* @calcom/Platform @calcom/Foundation
33
/apps/ui-playground/**/* @calcom/Consumer @calcom/Foundation
44
/apps/web/**/layout.tsx @calcom/Consumer @calcom/Foundation
5-
/apps/web/lib/**/* @calcom/Foundation
5+
/apps/web/lib/csp.ts @calcom/Foundation
6+
/apps/web/lib/buildNonce.ts @calcom/Foundation
7+
/apps/web/lib/daily-webhook/**/* @calcom/Foundation
8+
/apps/web/lib/core/**/* @calcom/Foundation
9+
/apps/web/lib/booking.ts @calcom/Foundation
10+
/apps/web/lib/handleOrgRedirect.ts @calcom/Foundation
611
/apps/web/middleware.ts @calcom/Foundation
712
/deploy/**/* @calcom/Foundation
813
/infra/**/* @calcom/Foundation

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
repo-token: ${{ secrets.EQUITY_BEE_TEAM_LABELER_ACTION_TOKEN }}
2828
organization-name: calcom
29-
ignore-labels: "admin, app-store, ai, authentication, automated-testing, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, dba, devops, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, teams, webhooks, workflows, zapier"
29+
ignore-labels: "admin, app-store, ai, authentication, automated-testing, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, dba, devops, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, self-hosted, teams, webhooks, workflows, zapier"
3030
apply-labels-from-issue:
3131
runs-on: ubuntu-latest
3232

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Performance Tests
2+
3+
on:
4+
release:
5+
types: [created]
6+
workflow_dispatch:
7+
inputs:
8+
base_url:
9+
description: 'Base URL for performance tests'
10+
required: false
11+
default: 'https://cal.dev'
12+
13+
jobs:
14+
performance-tests:
15+
runs-on: ubuntu-latest
16+
env:
17+
BASE_URL: ${{ github.event.inputs.base_url || 'https://cal.dev' }}
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Setup K6
23+
uses: grafana/setup-k6-action@v1
24+
with:
25+
k6-version: '1.0.0'
26+
27+
- name: Run Smoke Tests
28+
uses: grafana/run-k6-action@v1
29+
env:
30+
K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
31+
K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
32+
with:
33+
path: tests/performance/smoke/*.js
34+
cloud-run-locally: true
35+
fail-fast: true
36+
37+
- name: Run Load Tests
38+
uses: grafana/run-k6-action@v1
39+
env:
40+
K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
41+
K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
42+
with:
43+
path: tests/performance/load/*.js
44+
cloud-run-locally: true
45+
fail-fast: true
46+
47+
- name: Run Stress Tests
48+
uses: grafana/run-k6-action@v1
49+
env:
50+
K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
51+
K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
52+
with:
53+
path: tests/performance/stress/*.js
54+
cloud-run-locally: true
55+
fail-fast: true
56+
57+
- name: Run Spike Tests
58+
uses: grafana/run-k6-action@v1
59+
env:
60+
K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
61+
K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
62+
with:
63+
path: tests/performance/spike/*.js
64+
cloud-run-locally: true
65+
fail-fast: true

.yarn/versions/27b1f95d.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
undecided:
2+
- "@calcom/prisma"

.yarn/versions/446af0f7.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
undecided:
2+
- "@calcom/prisma"

.yarn/versions/eb32fb15.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
undecided:
2+
- calcom-monorepo
3+
- "@calcom/prisma"

apps/api/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@axiomhq/winston": "^1.2.0",
3939
"@calcom/platform-constants": "*",
4040
"@calcom/platform-enums": "*",
41-
"@calcom/platform-libraries": "npm:@calcom/[email protected].321",
41+
"@calcom/platform-libraries": "npm:@calcom/[email protected].335",
4242
"@calcom/platform-types": "*",
4343
"@calcom/platform-utils": "*",
4444
"@calcom/prisma": "*",

0 commit comments

Comments
 (0)