Skip to content

Commit 7e08906

Browse files
authored
Merge branch 'main' into lauris/cal-7035-fix-invalidate-old-refresh-tokens
2 parents 0970fc8 + c321a6c commit 7e08906

File tree

603 files changed

+9294
-60712
lines changed

Some content is hidden

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

603 files changed

+9294
-60712
lines changed

.easignore

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/companion.md

Lines changed: 0 additions & 120 deletions
This file was deleted.

.github/workflows/companion-build.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/companion-lint.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/companion-typecheck.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/pr.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ jobs:
167167
pull-requests: read
168168
outputs:
169169
has-files-requiring-all-checks: ${{ steps.filter-exclusions.outputs.has-files-requiring-all-checks }}
170-
has-companion: ${{ steps.filter-inclusions.outputs.has-companion }}
171170
has-api-v2-changes: ${{ steps.filter-inclusions.outputs.has-api-v2-changes }}
172171
has-prisma-changes: ${{ steps.filter-inclusions.outputs.has-prisma-changes }}
173172
has-agents-changes: ${{ steps.filter-inclusions.outputs.has-agents-changes }}
@@ -197,7 +196,6 @@ jobs:
197196
filters: |
198197
has-files-requiring-all-checks:
199198
- '**'
200-
- '!companion/**'
201199
- '!.vscode/**'
202200
- '!**/*.md'
203201
- '!**/*.mdx'
@@ -213,8 +211,6 @@ jobs:
213211
filters: |
214212
has-agents-changes:
215213
- "agents/**"
216-
has-companion:
217-
- "companion/**"
218214
has-api-v2-changes:
219215
- "apps/api/v2/**"
220216
- "packages/platform-constants/**"
@@ -387,27 +383,6 @@ jobs:
387383
uses: ./.github/workflows/docs-build.yml
388384
secrets: inherit
389385

390-
build-companion:
391-
name: Companion builds
392-
needs: [prepare]
393-
if: needs.prepare.outputs.has-companion == 'true'
394-
uses: ./.github/workflows/companion-build.yml
395-
secrets: inherit
396-
397-
typecheck-companion:
398-
name: Type Checks
399-
needs: [prepare]
400-
if: needs.prepare.outputs.has-companion == 'true'
401-
uses: ./.github/workflows/companion-typecheck.yml
402-
secrets: inherit
403-
404-
lint-companion:
405-
name: Linters
406-
needs: [prepare]
407-
if: needs.prepare.outputs.has-companion == 'true'
408-
uses: ./.github/workflows/companion-lint.yml
409-
secrets: inherit
410-
411386
build:
412387
name: Production builds
413388
needs: [prepare]
@@ -489,9 +464,6 @@ jobs:
489464
build-api-v2,
490465
build-atoms,
491466
build-docs,
492-
build-companion,
493-
typecheck-companion,
494-
lint-companion,
495467
setup-db,
496468
e2e,
497469
e2e-api-v2,
@@ -540,14 +512,6 @@ jobs:
540512
needs.e2e-app-store.result != 'success'
541513
)
542514
) ||
543-
(
544-
needs.prepare.outputs.has-companion == 'true' &&
545-
(
546-
needs.build-companion.result != 'success' ||
547-
needs.typecheck-companion.result != 'success' ||
548-
needs.lint-companion.result != 'success'
549-
)
550-
) ||
551515
(
552516
needs.prepare.outputs.has-agents-changes == 'true' &&
553517
needs.validate-agents-format.result != 'success'

.github/workflows/sync-agents-to-devin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ permissions:
1212

1313
jobs:
1414
sync:
15+
if: false
1516
name: Sync to Devin Knowledge
1617
runs-on: blacksmith-2vcpu-ubuntu-2404
1718
steps:

apps/api/v1/pages/api/bookings/[id]/_delete.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ async function handler(req: NextApiRequest) {
8282
return await handleCancelBooking({
8383
bookingData: { id, allRemainingBookings, cancellationReason, cancelledBy },
8484
userId: req.userId,
85+
actionSource: "API_V1",
8586
});
8687
}
8788

apps/api/v1/test/lib/bookings/_post.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// TODO: Fix tests (These test were never running due to the vitest workspace config)
21
import prismaMock from "@calcom/testing/lib/__mocks__/prismaMock";
32

43
import type { Request, Response } from "express";

apps/api/v1/trigger.version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const TRIGGER_VERSION = '20260212.3';
1+
export const TRIGGER_VERSION = '20260216.1';

0 commit comments

Comments
 (0)