Skip to content

Commit 6e0d32e

Browse files
gitstart-calcomgitstart-calcom
authored
Merge branch 'main' into color-picker-storybook
2 parents e938b1a + 3223beb commit 6e0d32e

250 files changed

Lines changed: 4542 additions & 2074 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.

‎.env.example‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ TWILIO_WHATSAPP_PHONE_NUMBER=
126126
NEXT_PUBLIC_SENDER_ID=
127127
TWILIO_VERIFY_SID=
128128

129-
# This is used so we can bypass emails in auth flows for E2E testing
130-
# Set it to "1" if you need to run E2E tests locally
129+
# Set it to "1" if you need to run E2E tests locally.
131130
NEXT_PUBLIC_IS_E2E=
132131

133132
# Used for internal billing system
@@ -172,6 +171,12 @@ EMAIL_SERVER_PORT=1025
172171
## You will need to provision an App Password.
173172
## @see https://support.google.com/accounts/answer/185833
174173
# EMAIL_SERVER_PASSWORD='<gmail_app_password>'
174+
175+
# Used for E2E for email testing
176+
# Set it to "1" if you need to email checks in E2E tests locally
177+
# Make sure to run mailhog container manually or with `yarn dx`
178+
E2E_TEST_MAILHOG_ENABLED=
179+
175180
# **********************************************************************************************************
176181

177182
# Set the following value to true if you wish to enable Team Impersonation

‎.github/workflows/cron-bookingReminder.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
# "Scheduled workflows run on the latest commit on the default or base branch."
55
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
66
schedule:
7-
# Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
8-
- cron: "0,15,30,45 * * * *"
7+
# Runs "At every 15th minute." (see https://crontab.guru)
8+
- cron: "*/15 * * * *"
99
jobs:
1010
cron-bookingReminder:
1111
env:
@@ -20,4 +20,4 @@ jobs:
2020
-X POST \
2121
-H 'content-type: application/json' \
2222
-H 'authorization: ${{ secrets.CRON_API_KEY }}' \
23-
--fail
23+
-sSf

‎.github/workflows/cron-downgradeUsers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
# "Scheduled workflows run on the latest commit on the default or base branch."
66
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
77
schedule:
8-
# Runs “Every month at 1st (see https://crontab.guru)
8+
# Runs "At 00:00 on day-of-month 1." (see https://crontab.guru)
99
- cron: "0 0 1 * *"
1010
jobs:
1111
cron-downgradeUsers:
@@ -21,4 +21,4 @@ jobs:
2121
-X POST \
2222
-H 'content-type: application/json' \
2323
-H 'authorization: ${{ secrets.CRON_API_KEY }}' \
24-
--fail
24+
-sSf

‎.github/workflows/cron-scheduleEmailReminders.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
# "Scheduled workflows run on the latest commit on the default or base branch."
55
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
66
schedule:
7-
# Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
8-
- cron: "0,15,30,45 * * * *"
7+
# Runs "At every 15th minute." (see https://crontab.guru)
8+
- cron: "*/15 * * * *"
99
jobs:
1010
cron-scheduleEmailReminders:
1111
env:
@@ -20,4 +20,4 @@ jobs:
2020
-X POST \
2121
-H 'content-type: application/json' \
2222
-H 'authorization: ${{ secrets.CRON_API_KEY }}' \
23-
--fail
23+
-sSf

‎.github/workflows/cron-scheduleSMSReminders.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
# "Scheduled workflows run on the latest commit on the default or base branch."
55
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
66
schedule:
7-
# Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
8-
- cron: "0,15,30,45 * * * *"
7+
# Runs "At every 15th minute." (see https://crontab.guru)
8+
- cron: "*/15 * * * *"
99
jobs:
1010
cron-scheduleSMSReminders:
1111
env:
@@ -20,4 +20,4 @@ jobs:
2020
-X POST \
2121
-H 'content-type: application/json' \
2222
-H 'authorization: ${{ secrets.CRON_API_KEY }}' \
23-
--fail
23+
-sSf

‎.github/workflows/cron-scheduleWhatsappReminders.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
# "Scheduled workflows run on the latest commit on the default or base branch."
55
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
66
schedule:
7-
# Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
8-
- cron: "0,15,30,45 * * * *"
7+
# Runs "At every 15th minute." (see https://crontab.guru)
8+
- cron: "*/15 * * * *"
99
jobs:
1010
cron-scheduleWhatsappReminders:
1111
env:
@@ -20,4 +20,4 @@ jobs:
2020
-X POST \
2121
-H 'content-type: application/json' \
2222
-H 'authorization: ${{ secrets.CRON_API_KEY }}' \
23-
--fail
23+
-sSf

‎.github/workflows/cron-stale-issue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
# "Scheduled workflows run on the latest commit on the default or base branch."
99
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
1010
schedule:
11-
# Runs every day (see https://crontab.guru)
11+
# Runs "At 00:00." every day (see https://crontab.guru)
1212
- cron: "0 0 * * *"
1313
workflow_dispatch:
1414
jobs:

‎.github/workflows/cron-syncAppMeta.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
# "Scheduled workflows run on the latest commit on the default or base branch."
66
# — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
77
schedule:
8-
# Runs “Every month at 1st (see https://crontab.guru)
8+
# Runs "At 00:00 on day-of-month 1." (see https://crontab.guru)
99
- cron: "0 0 1 * *"
1010
jobs:
1111
cron-syncAppMeta:
@@ -21,4 +21,4 @@ jobs:
2121
-X POST \
2222
-H 'content-type: application/json' \
2323
-H 'authorization: ${{ secrets.CRON_API_KEY }}' \
24-
--fail
24+
-sSf

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
4444
E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}
4545
E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}
46+
E2E_TEST_MAILHOG_ENABLED: ${{ vars.E2E_TEST_MAILHOG_ENABLED }}
4647
GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
4748
GOOGLE_LOGIN_ENABLED: ${{ vars.CI_GOOGLE_LOGIN_ENABLED }}
4849
NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
4444
E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}
4545
E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}
46+
E2E_TEST_MAILHOG_ENABLED: ${{ vars.E2E_TEST_MAILHOG_ENABLED }}
4647
GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
4748
GOOGLE_LOGIN_ENABLED: ${{ vars.CI_GOOGLE_LOGIN_ENABLED }}
4849
NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}

0 commit comments

Comments
 (0)