Merge branch 'main' into devin/sparse-checkout-optimization-1768051915

devin-ai-integration[bot] · devin-ai-integration[bot] · commit 975b02c0fcb2 · 2026-01-10T19:31:42.000Z
Resolved merge conflicts in:
- .github/actions/cache-checkout/action.yml: Kept PR's save/restore mode design
- .github/workflows/pr.yml: Kept PR's sparse-checkout + dangerous-git-checkout approach

Co-Authored-By: unknown &lt;&gt;
diff --git a/.github/workflows/api-v1-production-build.yml b/.github/workflows/api-v1-production-build.yml
@@ -68,8 +68,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/cache-db
       - name: Cache API v1 production build
diff --git a/.github/workflows/api-v2-production-build.yml b/.github/workflows/api-v2-production-build.yml
@@ -38,8 +38,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - name: Generate Prisma schemas
         working-directory: apps/api/v2
diff --git a/.github/workflows/api-v2-unit-tests.yml b/.github/workflows/api-v2-unit-tests.yml
@@ -15,8 +15,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - run: yarn prisma generate
       - name: Run API v2 unit tests
diff --git a/.github/workflows/atoms-production-build.yml b/.github/workflows/atoms-production-build.yml
@@ -15,8 +15,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - name: Cache atoms production build
         uses: actions/cache@v4
diff --git a/.github/workflows/check-api-v2-breaking-changes.yml b/.github/workflows/check-api-v2-breaking-changes.yml
@@ -37,8 +37,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
 
       - name: Generate Swagger
diff --git a/.github/workflows/check-types.yml b/.github/workflows/check-types.yml
@@ -15,8 +15,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - name: Show info
         run: node -e "console.log(require('v8').getHeapStatistics())"
diff --git a/.github/workflows/companion-build.yml b/.github/workflows/companion-build.yml
@@ -20,8 +20,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -15,8 +15,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - name: Cache Docs build
         uses: actions/cache@v4
         id: cache-docs-build
diff --git a/.github/workflows/e2e-api-v2.yml b/.github/workflows/e2e-api-v2.yml
@@ -77,8 +77,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/cache-db
       - name: Build platform packages with Turbo
diff --git a/.github/workflows/e2e-app-store.yml b/.github/workflows/e2e-app-store.yml
@@ -84,8 +84,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - run: yarn prisma generate
diff --git a/.github/workflows/e2e-embed-react.yml b/.github/workflows/e2e-embed-react.yml
@@ -76,8 +76,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - run: yarn prisma generate
diff --git a/.github/workflows/e2e-embed.yml b/.github/workflows/e2e-embed.yml
@@ -84,8 +84,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - run: yarn prisma generate
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -85,8 +85,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/yarn-playwright-install
       - run: yarn prisma generate
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -82,8 +82,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - run: yarn prisma generate
       - uses: ./.github/actions/cache-db
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,8 +13,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - name: Run Lint
         run: yarn lint
diff --git a/.github/workflows/production-build-without-database.yml b/.github/workflows/production-build-without-database.yml
@@ -46,8 +46,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - run: yarn prisma generate
       - name: Generate cache key
diff --git a/.github/workflows/setup-db.yml b/.github/workflows/setup-db.yml
@@ -50,8 +50,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
         if: inputs.DB_CACHE_HIT != 'true'
       - run: yarn prisma generate
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,8 +15,6 @@ jobs:
         with:
           sparse-checkout: .github
       - uses: ./.github/actions/cache-checkout
-        with:
-          mode: restore
       - uses: ./.github/actions/yarn-install
       - run: yarn prisma generate
       - run: yarn test -- --no-isolate
diff --git a/packages/features/bookingReference/repositories/BookingReferenceRepository.integration-test.ts b/packages/features/bookingReference/repositories/BookingReferenceRepository.integration-test.ts
@@ -5,6 +5,8 @@ import type { Booking, Credential, User } from "@calcom/prisma/client";
 
 import { BookingReferenceRepository } from "./BookingReferenceRepository";
 
+const testRunId = `${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
+
 describe("BookingReferenceRepository Integration Tests", () => {
   let testUser: User;
   let testCredential: Credential;
@@ -14,8 +16,8 @@ describe("BookingReferenceRepository Integration Tests", () => {
   beforeAll(async () => {
     testUser = await prisma.user.create({
       data: {
-        email: "bookingreference-test@example.com",
-        username: "bookingreference-test",
+        email: `bookingreference-test-${testRunId}@example.com`,
+        username: `bookingreference-test-${testRunId}`,
       },
     });
 
@@ -29,7 +31,7 @@ describe("BookingReferenceRepository Integration Tests", () => {
 
     testBooking = await prisma.booking.create({
       data: {
-        uid: "test-booking-uid-123",
+        uid: `test-booking-uid-${testRunId}`,
         title: "Test Booking",
         startTime: new Date(),
         endTime: new Date(),
@@ -52,19 +54,25 @@ describe("BookingReferenceRepository Integration Tests", () => {
   });
 
   afterAll(async () => {
-    await prisma.booking.delete({
+    await prisma.bookingReference.deleteMany({
+      where: {
+        bookingId: testBooking.id,
+      },
+    });
+
+    await prisma.booking.deleteMany({
       where: {
         id: testBooking.id,
       },
     });
 
-    await prisma.credential.delete({
+    await prisma.credential.deleteMany({
       where: {
         id: testCredential.id,
       },
     });
 
-    await prisma.user.delete({
+    await prisma.user.deleteMany({
       where: {
         id: testUser.id,
       },
