Merge remote-tracking branch 'origin/main' into 08-10-formbuilderfiel…

…d_and_bookingfields_tests

.env.example

@@ -362,10 +362,13 @@ TASKER_ENABLE_EMAILS=0
 # Ratelimiting via unkey
 UNKEY_ROOT_KEY=
 
-
 # Used for Cal.ai Enterprise Voice AI Agents
 # https://retellai.com
 RETELL_AI_KEY=
 
 # Used to disallow emails as being added as guests on bookings
 BLACKLISTED_GUEST_EMAILS=
+
+# Custom privacy policy / terms URLs (for self-hosters: change to your privacy policy / terms URLs)
+NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=
+NEXT_PUBLIC_WEBSITE_TERMS_URL=

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,7 @@
 ## Mandatory Tasks (DO NOT REMOVE)
 
 - [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
-- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com). If N/A, write N/A here and check the checkbox.
+- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com/docs). If N/A, write N/A here and check the checkbox.
 - [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
 
 ## How should this be tested?

.github/actions/yarn-install/action.yml

@@ -37,8 +37,6 @@ runs:
       with:
         path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
         key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-download-cache-
 
     # Invalidated on yarn.lock changes
     - name: Restore node_modules

.github/actions/yarn-playwright-install/action.yml

@@ -3,6 +3,10 @@ description: "Install playwright, cache and restore if necessary"
 runs:
   using: "composite"
   steps:
+    - name: Get installed Playwright version
+      shell: bash
+      id: playwright-version
+      run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_ENV
     - name: Cache playwright binaries
       id: playwright-cache
       uses: buildjet/cache@v4
@@ -11,9 +15,7 @@ runs:
           ~/Library/Caches/ms-playwright
           ~/.cache/ms-playwright
           ${{ github.workspace }}/node_modules/playwright
-        key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cache-playwright-
+        key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
     - name: Yarn playwright install
       shell: bash
-      if: steps.playwright-cache.outputs.cache-hit != 'true'
-      run: yarn playwright install
+      run: yarn playwright install --with-deps

.github/workflows/all-checks.yml

@@ -34,6 +34,11 @@ jobs:
     uses: ./.github/workflows/api-v2-production-build.yml
     secrets: inherit
 
+  build-atoms:
+    name: Production builds
+    uses: ./.github/workflows/atoms-production-build.yml
+    secrets: inherit
+
   build:
     name: Production builds
     uses: ./.github/workflows/production-build-without-database.yml

.github/workflows/atoms-production-build.yml

@@ -0,0 +1,40 @@
+name: Atoms production Build
+
+on:
+  workflow_call:
+
+jobs:
+  build:
+    name: Build atoms
+    permissions:
+      contents: read
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - name: Cache atoms production build
+        uses: buildjet/cache@v4
+        id: cache-atoms-build
+        env:
+          cache-name: atoms-build
+          key-1: ${{ hashFiles('yarn.lock') }}
+          key-2: ${{ hashFiles('packages/platform/atoms/**.[jt]s', 'packages/platform/atoms/**.[jt]sx', '!**/node_modules') }}
+          key-3: ${{ github.event.pull_request.number || github.ref }}
+          # Ensures production-build.yml will always be fresh
+          key-4: ${{ github.sha }}
+        with:
+          path: |
+            **/dist/**
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}
+      - run: |
+          export NODE_OPTIONS="--max_old_space_size=8192"
+          if [ ${{ steps.cache-atoms-build.outputs.cache-hit }} == 'true' ]; then
+            echo "Cache hit for atoms build. Skipping build."
+          else
+            rm -rf packages/platform/atoms/node_modules
+            yarn install
+            yarn workspace @calcom/atoms run build
+          fi
+        shell: bash

.github/workflows/cleanup.yml

@@ -0,0 +1,65 @@
+name: Delete
+
+on:
+  delete:
+    branches-ignore: [main, gh-pages]
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+# ensures that currently running Playwright workflow of deleted branch gets cancelled
+concurrency:
+  group: ${{ github.event.ref }}
+  cancel-in-progress: true
+
+jobs:
+  delete_reports:
+    name: Delete Reports
+    runs-on: ubuntu-latest
+    env:
+      # Contains all reports for deleted branch
+      BRANCH_REPORTS_DIR: reports/${{ github.event.ref }}
+    steps:
+      - name: Checkout GitHub Pages Branch
+        uses: actions/checkout@v2
+        with:
+          repository: calcom/test-results
+          ref: gh-pages
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+      - name: Set Git User
+        # see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Check for workflow reports
+        run: |
+          if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
+            echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
+          else
+            echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
+          fi
+      - name: Delete reports from repo for branch
+        if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
+        timeout-minutes: 3
+        run: |
+          cd $BRANCH_REPORTS_DIR/..
+
+          rm -rf ${{ github.event.ref }}
+          git add .
+          git commit -m "workflow: remove all reports for branch ${{ github.event.ref }}"
+
+          while true; do
+            git pull --rebase
+            if [ $? -ne 0 ]; then
+              echo "Failed to rebase. Please review manually."
+              exit 1
+            fi
+
+            git push
+            if [ $? -eq 0 ]; then
+              echo "Successfully pushed HTML reports to repo."
+              exit 0
+            fi
+          done

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

@@ -45,6 +45,9 @@ jobs:
           - 5432:5432
       redis:
         image: redis:latest
+        credentials:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
         ports:
           - 6379:6379
         options: >-

.github/workflows/e2e-app-store.yml

@@ -98,5 +98,5 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: app-store-results
-          path: test-results
+          name: blob-report-app-store
+          path: blob-report

.github/workflows/e2e-embed-react.yml

@@ -85,5 +85,5 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: embed-react-results
-          path: test-results
+          name: blob-report-embed-react
+          path: blob-report

.github/workflows/e2e-embed.yml

@@ -91,5 +91,5 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: embed-core-results
-          path: test-results
+          name: blob-report-embed-core
+          path: blob-report

.github/workflows/e2e.yml

@@ -89,8 +89,9 @@ jobs:
       - name: Run Tests
         run: yarn e2e --shard=${{ matrix.shard }}/${{ strategy.job-total }}
       - name: Upload Test Results
-        if: ${{ always() }}
         uses: actions/upload-artifact@v4
+        if: always()
         with:
-          name: test-results-${{ matrix.shard }}_${{ strategy.job-total }}
-          path: test-results
+          name: blob-report-${{ matrix.shard }}
+          path: blob-report
+          retention-days: 30

.github/workflows/merge-reports.yml

@@ -0,0 +1,25 @@
+# https://playwright.dev/docs/test-sharding#merging-reports-from-multiple-shards
+on:
+  workflow_call:
+jobs:
+  merge-reports:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install
+      - name: Download blob reports from GitHub Actions Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-blob-reports
+          pattern: blob-report-*
+          merge-multiple: true
+      - name: Merge into HTML Report
+        run: yarn playwright merge-reports --reporter html ./all-blob-reports
+      - name: Upload HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
+          path: playwright-report
+          retention-days: 14

.github/workflows/pr-review.yml

@@ -7,11 +7,22 @@ on:
 jobs:
   label-pr:
     runs-on: ubuntu-latest
-
+    permissions:
+      actions: read
+      issues: write
+      pull-requests: write
     steps:
       - name: Label PR as ready for E2E
         if: github.event.review.state == 'approved'
-        uses: actions-ecosystem/action-add-labels@v1
+        uses: actions/github-script@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: process.env.labels.split(', '),
+            })
+        env:
+          github_token: ${{ secrets.READY_FOR_E2E_PAT }}
           labels: 'ready-for-e2e'