Skip to content

Commit fb2e5eb

Browse files
Udit-takkarUdit-takkar
authored
Merge branch 'main' into fix-booking-reassign-location-change
2 parents a8fb459 + e309e72 commit fb2e5eb

File tree

626 files changed

+32621
-11734
lines changed

Some content is hidden

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

626 files changed

+32621
-11734
lines changed

‎.eslintrc.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
module.exports = require("./packages/config/eslint-preset");
1+
// This configuration only applies to the package manager root.
2+
/** @type {import("eslint").Linter.Config} */
3+
module.exports = {
4+
extends: ["./packages/config/eslint-preset.js"],
5+
};

‎.github/workflows/atoms-e2e.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Atoms E2E Tests
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
paths:
8+
- 'packages/platform/atoms/**'
9+
- 'packages/platform/examples/base/**'
10+
- 'apps/api/v2/**'
11+
- '.github/workflows/atoms-e2e.yml'
12+
13+
permissions:
14+
actions: write
15+
contents: read
16+
17+
env:
18+
NODE_OPTIONS: --max-old-space-size=8096
19+
ATOMS_E2E_OAUTH_CLIENT_ID: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_ID }}
20+
ATOMS_E2E_OAUTH_CLIENT_SECRET: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_SECRET }}
21+
ATOMS_E2E_API_URL: ${{ secrets.ATOMS_E2E_API_URL }}
22+
ATOMS_E2E_ORG_ID: ${{ secrets.ATOMS_E2E_ORG_ID }}
23+
ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED: ${{ secrets.ATOMS_E2E_OAUTH_CLIENT_ID_BOOKER_EMBED }}
24+
DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
25+
DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
26+
27+
jobs:
28+
atoms-e2e:
29+
timeout-minutes: 15
30+
name: Atoms E2E Tests
31+
runs-on: buildjet-4vcpu-ubuntu-2204
32+
steps:
33+
- uses: docker/login-action@v3
34+
with:
35+
username: ${{ secrets.DOCKERHUB_USERNAME }}
36+
password: ${{ secrets.DOCKERHUB_TOKEN }}
37+
- uses: actions/checkout@v4
38+
- uses: ./.github/actions/dangerous-git-checkout
39+
- uses: ./.github/actions/yarn-install
40+
- uses: ./.github/actions/yarn-playwright-install
41+
- name: Run Atoms E2E Tests
42+
working-directory: packages/platform/examples/base
43+
run: yarn test:e2e
44+
- name: Upload Test Results
45+
uses: actions/upload-artifact@v4
46+
if: always()
47+
with:
48+
name: atoms-e2e-test-results
49+
path: test-results
50+
retention-days: 7
51+
- name: Upload Playwright Report
52+
uses: actions/upload-artifact@v4
53+
if: always()
54+
with:
55+
name: atoms-e2e-playwright-report
56+
path: playwright-report
57+
retention-days: 7

‎.github/workflows/e2e-api-v2.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ env:
2222
STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
2323
STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
2424
STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
25+
SLOTS_CACHE_TTL: ${{ secrets.CI_SLOTS_CACHE_TTL }}
2526
jobs:
2627
e2e:
2728
timeout-minutes: 20

‎.yarn/releases/yarn-3.4.1.cjs‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎.yarn/versions/19a4f764.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/1e3ec1e6.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/45e15b36.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/4cb6bf9f.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"

‎.yarn/versions/5cae75a1.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/7ec29ab0.yml‎

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

0 commit comments

Comments
 (0)