Compare commits
194 Commits
version-3.
...
v3.5.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da4a46b7e6 | ||
|
|
47294883d4 | ||
|
|
3ed7f7b7cb | ||
|
|
6f45f0e837 | ||
|
|
2826102030 | ||
|
|
979e7e36ca | ||
|
|
c9edbcd537 | ||
|
|
41ab0167fd | ||
|
|
e9110c008b | ||
|
|
244b648cc4 | ||
|
|
8f8fa9d27c | ||
|
|
a3454600b6 | ||
|
|
13d61e9917 | ||
|
|
a2699d4aa5 | ||
|
|
de1e01befc | ||
|
|
6d88667e84 | ||
|
|
189e57028d | ||
|
|
7892df8484 | ||
|
|
7f9fac974c | ||
|
|
86cd238314 | ||
|
|
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 | ||
|
|
8d8bfc5585 | ||
|
|
74aa6d7121 | ||
|
|
908834465e | ||
|
|
0bd99af9de | ||
|
|
061086165f | ||
|
|
cf978614db | ||
|
|
69fb59812a | ||
|
|
dfe010710b | ||
|
|
09027a5c97 | ||
|
|
578a104a92 | ||
|
|
b066cff0b3 | ||
|
|
d348680dc6 | ||
|
|
a4a51da68a | ||
|
|
16ec6da83f | ||
|
|
35125d3e41 | ||
|
|
0c502c56ff | ||
|
|
d922d0f363 | ||
|
|
d5fbf1869e | ||
|
|
7567a4669b | ||
|
|
4a368b6279 | ||
|
|
f0feb3920a | ||
|
|
6e264c2cbd | ||
|
|
c2fef16e7f | ||
|
|
98af1ee0f1 | ||
|
|
a014e6987d | ||
|
|
80fbee033f | ||
|
|
aa03d3300a | ||
|
|
2fda3845b0 | ||
|
|
2ab6ff4284 | ||
|
|
4937e38996 | ||
|
|
29994d5a47 | ||
|
|
5d36da146c | ||
|
|
c8abf7a184 | ||
|
|
f5ca95e8a8 | ||
|
|
6f6a258db1 | ||
|
|
91b9623260 | ||
|
|
594b253883 |
59
.github/workflows/create-release.yaml
vendored
Normal file
59
.github/workflows/create-release.yaml
vendored
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
name: "Create Release"
|
||||||
|
|
||||||
|
on: # yamllint disable-line rule:truthy
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
RELEASE_TAG:
|
||||||
|
description: 'v{Major}.{Minor}.{Patch}'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
name: "Release"
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
runs-on: "ubuntu-latest"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
|
||||||
|
- name: Checkout source
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
|
||||||
|
submodules: true
|
||||||
|
|
||||||
|
- name: Create branch and tag submodule
|
||||||
|
run: |
|
||||||
|
git config user.email "actions@github.com"
|
||||||
|
git config user.name "actions-user"
|
||||||
|
git submodule update --init --remote
|
||||||
|
git checkout -b 'release-${{ inputs.RELEASE_TAG }}'
|
||||||
|
(cd calcom && git fetch --tags origin && git checkout 'refs/tags/${{ inputs.RELEASE_TAG }}')
|
||||||
|
git add calcom
|
||||||
|
git commit -m "tag version Cal.com version ${{ inputs.RELEASE_TAG }}"
|
||||||
|
git push origin 'release-${{ inputs.RELEASE_TAG }}'
|
||||||
|
|
||||||
|
# note: instead of secrets.GITHUB_TOKEN here, we need to use a PAT
|
||||||
|
# so that the release creation triggers the image build workflow
|
||||||
|
- name: "Create release"
|
||||||
|
uses: "actions/github-script@v6"
|
||||||
|
with:
|
||||||
|
github-token: "${{ secrets.ACTIONS_ACCESS_TOKEN }}"
|
||||||
|
script: |
|
||||||
|
try {
|
||||||
|
const response = await github.rest.repos.createRelease({
|
||||||
|
draft: false,
|
||||||
|
generate_release_notes: true,
|
||||||
|
body: 'For Cal.com release details, see: https://github.com/calcom/cal.com/releases/tag/${{ inputs.RELEASE_TAG }}',
|
||||||
|
name: '${{ inputs.RELEASE_TAG }}',
|
||||||
|
target_commitish: 'release-${{ inputs.RELEASE_TAG }}',
|
||||||
|
owner: context.repo.owner,
|
||||||
|
prerelease: false,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
tag_name: '${{ inputs.RELEASE_TAG }}',
|
||||||
|
});
|
||||||
|
|
||||||
|
core.exportVariable('RELEASE_ID', response.data.id);
|
||||||
|
core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url);
|
||||||
|
} catch (error) {
|
||||||
|
core.setFailed(error.message);
|
||||||
|
}
|
||||||
@@ -17,6 +17,11 @@ on:
|
|||||||
- completed
|
- completed
|
||||||
# Allow running workflow manually from the Actions tab
|
# Allow running workflow manually from the Actions tab
|
||||||
workflow_dispatch:
|
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'
|
# Leaving in example for releases. Initially we simply push to 'latest'
|
||||||
# on:
|
# on:
|
||||||
@@ -32,7 +37,12 @@ jobs:
|
|||||||
|
|
||||||
# Steps represent a sequence of tasks that will be executed as part of the job
|
# Steps represent a sequence of tasks that will be executed as part of the job
|
||||||
steps:
|
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
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
@@ -92,13 +102,14 @@ jobs:
|
|||||||
# [worker.oci]
|
# [worker.oci]
|
||||||
# max-parallelism = 1
|
# max-parallelism = 1
|
||||||
|
|
||||||
- name: Build and push image
|
- name: Build image
|
||||||
id: docker_build
|
id: docker_build
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: ./
|
context: ./
|
||||||
file: ./Dockerfile
|
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
|
platforms: linux/amd64
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
@@ -108,13 +119,75 @@ jobs:
|
|||||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
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: |
|
# 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 }}
|
||||||
|
|
||||||
|
- name: Image digest
|
||||||
|
run: echo ${{ steps.docker_build.outputs.digest }}
|
||||||
|
|
||||||
- name: Cleanup
|
- name: Cleanup
|
||||||
run: |
|
run: |
|
||||||
docker compose down
|
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/.yarn ./.yarn
|
||||||
COPY calcom/apps/web ./apps/web
|
COPY calcom/apps/web ./apps/web
|
||||||
COPY calcom/packages ./packages
|
COPY calcom/packages ./packages
|
||||||
|
COPY calcom/tests ./tests
|
||||||
|
|
||||||
RUN yarn config set httpTimeout 1200000 && \
|
RUN yarn config set httpTimeout 1200000 && \
|
||||||
npx turbo prune --scope=@calcom/web --docker && \
|
npx turbo prune --scope=@calcom/web --docker && \
|
||||||
|
|||||||
2
calcom
2
calcom
Submodule calcom updated: 3559e0d082...2e50625165
Reference in New Issue
Block a user