Compare commits
212 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
212978f46f | ||
|
|
4872e2ccdb | ||
|
|
2c468dabe8 | ||
|
|
3319d21c86 | ||
|
|
b55ef0ee29 | ||
|
|
30f2d169c2 | ||
|
|
2ae6b6dc76 | ||
|
|
47df2405ab | ||
|
|
d83e909f9f | ||
|
|
b27f452d03 | ||
|
|
bd43bb65bd | ||
|
|
62c5ca50a0 | ||
|
|
e503097a49 | ||
|
|
aeb60e0a3d | ||
|
|
fef732420a | ||
|
|
c5f20f47ab | ||
|
|
0a561b574b | ||
|
|
b17d5f4910 | ||
|
|
9e0d6c150a | ||
|
|
13fb3c9c1d | ||
|
|
4ba71f7b9c | ||
|
|
df4de6092e | ||
|
|
f101524423 | ||
|
|
b6c80dfccb | ||
|
|
20786fc296 | ||
|
|
66553b3506 | ||
|
|
cb28a431c8 | ||
|
|
b6f08fc75c | ||
|
|
de409f5c9b | ||
|
|
653cf3924d | ||
|
|
c73da42f4b | ||
|
|
dbc8aa7d48 | ||
|
|
ae517b2bca | ||
|
|
61d9746b1c | ||
|
|
c869387f1a | ||
|
|
747efb35a6 | ||
|
|
47ccb38f20 | ||
|
|
83a87787c6 | ||
|
|
7d628a5639 | ||
|
|
fdfc976633 | ||
|
|
bd85e24f45 | ||
|
|
62a3e32c4a | ||
|
|
e23bc10821 | ||
|
|
dd96115ddf | ||
|
|
4511b8a5cb | ||
|
|
7b4a5d4aea | ||
|
|
f484df66de | ||
|
|
6ebe2bd8f2 | ||
|
|
e26a5eecda | ||
|
|
33c89ec034 | ||
|
|
11cee9e911 | ||
|
|
6d9e7c41ff | ||
|
|
9d56a60d85 | ||
|
|
47294883d4 | ||
|
|
3ed7f7b7cb | ||
|
|
6f45f0e837 | ||
|
|
2826102030 | ||
|
|
979e7e36ca | ||
|
|
c9edbcd537 | ||
|
|
41ab0167fd | ||
|
|
e9110c008b | ||
|
|
244b648cc4 | ||
|
|
8f8fa9d27c | ||
|
|
a3454600b6 | ||
|
|
13d61e9917 | ||
|
|
a2699d4aa5 | ||
|
|
de1e01befc | ||
|
|
6d88667e84 | ||
|
|
189e57028d | ||
|
|
7892df8484 | ||
|
|
7f9fac974c | ||
|
|
86cd238314 | ||
|
|
bb52fcc61d | ||
|
|
30e01c3741 | ||
|
|
ae2d7fbd6a | ||
|
|
49bc08e485 | ||
|
|
cb34b575a7 | ||
|
|
ec6ab9ddb6 | ||
|
|
a93ff42551 | ||
|
|
7949b536ab | ||
|
|
b456c44861 | ||
|
|
caf2d93632 | ||
|
|
a5eed610aa | ||
|
|
905a2832f2 | ||
|
|
592ac2fb0e | ||
|
|
0f1cf770cc | ||
|
|
8d8b18e5bd | ||
|
|
736dfecc0c | ||
|
|
4679fc0ddf | ||
|
|
5956e7f1a0 | ||
|
|
d8cb522055 | ||
|
|
a728ac7339 | ||
|
|
fcf45975df | ||
|
|
2a5375f4ea | ||
|
|
b3a3679a6b | ||
|
|
9fdfca486a | ||
|
|
54400a2161 | ||
|
|
e0521c140d | ||
|
|
dcb66ee989 | ||
|
|
c0f7cf77cb | ||
|
|
c4d6e766fa | ||
|
|
dbbda43758 | ||
|
|
054b49abde | ||
|
|
1fdd941c0a | ||
|
|
cba7f20546 | ||
|
|
8d58343954 | ||
|
|
8543c18079 | ||
|
|
47d0b7e9bf | ||
|
|
db874ff8b1 | ||
|
|
b49cf5cd28 | ||
|
|
0acdb4b98a | ||
|
|
d282ff71d1 | ||
|
|
f89ea705e2 | ||
|
|
fca3070045 | ||
|
|
f32bf8b6da | ||
|
|
5d58199abc | ||
|
|
7cc495d54e | ||
|
|
87379fea88 | ||
|
|
34c213f56a | ||
|
|
04e4c64efe | ||
|
|
a23fd8b12a | ||
|
|
4be3f45228 | ||
|
|
d17064f67f | ||
|
|
aad1382418 | ||
|
|
f7885eed69 | ||
|
|
008ddd57f3 | ||
|
|
0048a58b26 | ||
|
|
89bd10bd84 | ||
|
|
ff0db3a97c | ||
|
|
bd8a941f50 | ||
|
|
8353418232 | ||
|
|
26784d6969 | ||
|
|
a1d56a1f17 | ||
|
|
92512fd052 | ||
|
|
933f4722e9 | ||
|
|
4870434673 | ||
|
|
bcdff6eeb0 | ||
|
|
1cb1dec45b | ||
|
|
316124258f | ||
|
|
44997263f1 | ||
|
|
83d34f8df5 | ||
|
|
42e1b7260a | ||
|
|
d4e0fcecb9 | ||
|
|
5dbfc57d3c | ||
|
|
5f2a14bc63 | ||
|
|
a049989155 | ||
|
|
ff56a03fb6 | ||
|
|
9a74219dfd | ||
|
|
2b54576f05 | ||
|
|
fe5c310556 | ||
|
|
d299d9ae5e | ||
|
|
fa788cf600 | ||
|
|
7aea26c8a6 | ||
|
|
0d690c922a | ||
|
|
3c74585d48 | ||
|
|
083867dc77 | ||
|
|
06dd7f0821 | ||
|
|
74fadbc4cc | ||
|
|
838ffae9a6 | ||
|
|
5b159a7fb4 | ||
|
|
3ab1d7055e | ||
|
|
5c57c20d20 | ||
|
|
98fd99bced | ||
|
|
c17606cc0a | ||
|
|
064b31a641 | ||
|
|
769c1d91ee | ||
|
|
dffaae7cce | ||
|
|
44c0ba5eaf | ||
|
|
e6586b196b | ||
|
|
abcbf1a5de | ||
|
|
51ad2ea126 | ||
|
|
12caf3f4bf | ||
|
|
2265cf05f3 | ||
|
|
d8b94d4335 | ||
|
|
8db8b631da | ||
|
|
0e6fab7bf7 | ||
|
|
2b0bd7896e | ||
|
|
a2a9d0aca1 | ||
|
|
59bed07eca | ||
|
|
e9673bd1a4 | ||
|
|
780b708d49 | ||
|
|
915c9f7837 | ||
|
|
775eb7c83b | ||
|
|
1b94b0a4cc | ||
|
|
bc9d85b650 | ||
|
|
14564d06d8 | ||
|
|
7fd57f9097 | ||
|
|
a32eddc4d4 | ||
|
|
2581a9de2a | ||
|
|
82d0155b4e | ||
|
|
84d500c89c | ||
|
|
6c323097b6 | ||
|
|
4a6d1b4732 | ||
|
|
3279928c9d | ||
|
|
01ac9f4ff2 | ||
|
|
c2f7e69a59 | ||
|
|
546ef1305e | ||
|
|
d0c7668d34 | ||
|
|
68765805be | ||
|
|
6a15aaa42f | ||
|
|
c27de4875c | ||
|
|
71c0c84383 | ||
|
|
e94c50a224 | ||
|
|
7106728280 | ||
|
|
c24bc644e4 | ||
|
|
2ab14ab1ba | ||
|
|
92eb7b1b38 | ||
|
|
f4a717e9b8 | ||
|
|
208bd9c4b9 | ||
|
|
8c6594216f | ||
|
|
c4aa0e2ad2 | ||
|
|
28380a9517 |
3
.github/workflows/create-release.yaml
vendored
3
.github/workflows/create-release.yaml
vendored
@@ -39,6 +39,7 @@ jobs:
|
||||
with:
|
||||
github-token: "${{ secrets.ACTIONS_ACCESS_TOKEN }}"
|
||||
script: |
|
||||
const isPreRelease = '${{ inputs.RELEASE_TAG }}'.includes('-rc');
|
||||
try {
|
||||
const response = await github.rest.repos.createRelease({
|
||||
draft: false,
|
||||
@@ -47,7 +48,7 @@ jobs:
|
||||
name: '${{ inputs.RELEASE_TAG }}',
|
||||
target_commitish: 'release-${{ inputs.RELEASE_TAG }}',
|
||||
owner: context.repo.owner,
|
||||
prerelease: false,
|
||||
prerelease: isPreRelease,
|
||||
repo: context.repo.repo,
|
||||
tag_name: '${{ inputs.RELEASE_TAG }}',
|
||||
});
|
||||
|
||||
@@ -17,6 +17,11 @@ on:
|
||||
- completed
|
||||
# Allow running workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
# Uncomment below to allow specific version workflow run
|
||||
# inputs:
|
||||
# version:
|
||||
# description: 'Version to build'
|
||||
# required: true
|
||||
|
||||
# Leaving in example for releases. Initially we simply push to 'latest'
|
||||
# on:
|
||||
@@ -32,7 +37,12 @@ jobs:
|
||||
|
||||
# Steps represent a sequence of tasks that will be executed as part of the job
|
||||
steps:
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it, uncomment below
|
||||
# - name: Checkout code at specified version
|
||||
# uses: actions/checkout@v2
|
||||
# with:
|
||||
# ref: ${{ github.event.inputs.version }}
|
||||
|
||||
- name: checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
@@ -65,6 +75,9 @@ jobs:
|
||||
docker.io/calendso/calendso
|
||||
docker.io/calcom/cal.com
|
||||
ghcr.io/calcom/cal.com
|
||||
# Add flavor latest only on full releases, not on pre-releases
|
||||
flavor: |
|
||||
latest=${{ !github.event.release.prerelease }}
|
||||
|
||||
- name: Copy env
|
||||
run: |
|
||||
@@ -92,13 +105,14 @@ jobs:
|
||||
# [worker.oci]
|
||||
# max-parallelism = 1
|
||||
|
||||
- name: Build and push image
|
||||
- name: Build image
|
||||
id: docker_build
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: ./
|
||||
file: ./Dockerfile
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
load: true # Load the image into the Docker daemon
|
||||
push: false # Do not push the image at this stage
|
||||
platforms: linux/amd64
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
@@ -108,13 +122,76 @@ jobs:
|
||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||
|
||||
# - name: Build with docker compose
|
||||
- name: Test runtime
|
||||
run: |
|
||||
tags="${{ steps.meta.outputs.tags }}"
|
||||
IFS=',' read -ra ADDR <<< "$tags" # Convert string to array using ',' as delimiter
|
||||
tag=${ADDR[0]} # Get the first tag
|
||||
|
||||
docker run --rm --network stack \
|
||||
-p 3000:3000 \
|
||||
-e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
|
||||
-e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
|
||||
-e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
|
||||
$tag &
|
||||
|
||||
server_pid=$!
|
||||
|
||||
|
||||
echo "Waiting for the server to start..."
|
||||
sleep 120
|
||||
|
||||
echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
|
||||
|
||||
for i in {1..60}; do
|
||||
echo "Checking server health ($i/60)..."
|
||||
response=$(curl -o /dev/null -s -w "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login)
|
||||
echo "HTTP Status Code: $response"
|
||||
if [[ "$response" == "200" ]] || [[ "$response" == "307" ]]; then
|
||||
echo "Server is healthy"
|
||||
# Now, shutdown the server
|
||||
kill $server_pid
|
||||
exit 0
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
|
||||
echo "Server health check failed"
|
||||
kill $server_pid
|
||||
exit 1
|
||||
env:
|
||||
NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
|
||||
CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL'
|
||||
|
||||
|
||||
# - name: Push image
|
||||
# run: |
|
||||
# DOCKER_BUILDKIT=0 docker compose build --build-arg DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} calcom
|
||||
# tags="${{ steps.meta.outputs.tags }}"
|
||||
# IFS=',' read -ra ADDR <<< "$tags" # Convert string to array using ',' as delimiter
|
||||
# for tag in "${ADDR[@]}"; do
|
||||
# docker push $tag
|
||||
# done
|
||||
|
||||
- name: Push image
|
||||
id: docker_push
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: ./
|
||||
file: ./Dockerfile
|
||||
push: true
|
||||
platforms: linux/amd64
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
build-args: |
|
||||
NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
|
||||
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||
if: ${{ !github.event.release.prerelease }}
|
||||
|
||||
- name: Image digest
|
||||
run: echo ${{ steps.docker_build.outputs.digest }}
|
||||
|
||||
- name: Cleanup
|
||||
run: |
|
||||
docker compose down
|
||||
|
||||
- name: Image digest
|
||||
run: echo ${{ steps.docker_build.outputs.digest }}
|
||||
|
||||
@@ -21,6 +21,7 @@ COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.c
|
||||
COPY calcom/.yarn ./.yarn
|
||||
COPY calcom/apps/web ./apps/web
|
||||
COPY calcom/packages ./packages
|
||||
COPY calcom/tests ./tests
|
||||
|
||||
RUN yarn config set httpTimeout 1200000 && \
|
||||
npx turbo prune --scope=@calcom/web --docker && \
|
||||
|
||||
2
calcom
2
calcom
Submodule calcom updated: 43a30aa51d...fe5eca8eb3
Reference in New Issue
Block a user