diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml deleted file mode 100644 index 1058323d9..000000000 --- a/.github/workflows/create-release.yaml +++ /dev/null @@ -1,60 +0,0 @@ -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: | - const isPreRelease = '${{ inputs.RELEASE_TAG }}'.includes('-rc'); - 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: isPreRelease, - 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); - } diff --git a/.github/workflows/docker-build-push-dockerhub.yml.old b/.github/workflows/docker-build-push-dockerhub.yml.old deleted file mode 100644 index c467e690c..000000000 --- a/.github/workflows/docker-build-push-dockerhub.yml.old +++ /dev/null @@ -1,199 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Build and push image to DockerHub - -# Controls when the workflow will run -on: - push: - branches: - - 'main' - tags: - - 'v*' - # update on run of Update Calendso nightly submodule update - workflow_run: - workflows: ["Update Calendso"] - branches: [main] - types: - - 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: - # release: - # types: [ created ] - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-space@main - with: - # Free about 4.5 GB, elminating our disk space issues - tool-cache: true - - # 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@v4 - - - name: Git submodule update - run: | - git submodule update --init - - - name: Log in to the Docker Hub registry - uses: docker/login-action@v3 - with: - # Username used to log against the Docker registry - username: ${{ secrets.DOCKER_HUB_USERNAME }} - # Password or personal access token used to log against the Docker registry - password: ${{ secrets.DOCKER_HUB_TOKEN }} - # Log out from the Docker registry at the end of a job - logout: true # optional, default is true - - - name: Log in to the Github Container registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: | - 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: | - grep -o '^[^#]*' .env.example > .env - cat .env >> $GITHUB_ENV - echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV - eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; - - # Temporarily disable ARM build due to runner performance issues - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v2 - - - name: Start database - run: | - docker compose up -d database - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver-opts: | - network=container:database - buildkitd-flags: | - --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host -# config-inline: | -# [worker.oci] -# max-parallelism = 1 - - - name: Build image - id: docker_build - uses: docker/build-push-action@v5 - with: - context: ./ - file: ./Dockerfile - 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 }} - build-args: | - NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }} - NEXT_PUBLIC_API_V2_URL=${{ env.NEXT_PUBLIC_API_V2_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 }} - DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} - - - 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 DATABASE_DIRECT_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 - id: docker_push - uses: docker/build-push-action@v5 - 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_API_V2_URL=${{ env.NEXT_PUBLIC_API_V2_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 }} - DATABASE_DIRECT_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 diff --git a/.github/workflows/docker-build-push-ghcr.yaml b/.github/workflows/docker-build-push-ghcr.yaml index bc4f220ed..63fc166da 100644 --- a/.github/workflows/docker-build-push-ghcr.yaml +++ b/.github/workflows/docker-build-push-ghcr.yaml @@ -1,17 +1,11 @@ name: Build and push image to GitHub Container Registry -on: - pull_request +on: pull_request # on: # push: # branches: # - "main" - # workflow_run: - # workflows: ["Update Calendso"] - # branches: [main] - # types: - # - completed jobs: build: @@ -66,8 +60,8 @@ jobs: with: context: ./ file: ./Dockerfile - load: true # Load the image into the Docker daemon - push: false # Do not push the image at this stage + 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 }} @@ -75,7 +69,7 @@ jobs: NEXT_PUBLIC_WEBAPP_URL=${{ secrets.NEXT_PUBLIC_WEBAPP_URL }} NEXT_PUBLIC_API_V2_URL=${{ secrets.NEXT_PUBLIC_API_V2_URL }} NEXT_PUBLIC_LICENSE_CONSENT=${{ secrets.NEXT_PUBLIC_LICENSE_CONSENT }} - + - name: Test runtime run: | tags="${{ steps.meta.outputs.tags }}" @@ -97,7 +91,6 @@ jobs: server_pid=$! - echo "Waiting for the server to start..." sleep 120 diff --git a/.github/workflows/scarf-data-export.yml.old b/.github/workflows/scarf-data-export.yml.old deleted file mode 100644 index 64a76e3ee..000000000 --- a/.github/workflows/scarf-data-export.yml.old +++ /dev/null @@ -1,14 +0,0 @@ -name: Export Scarf data -on: - schedule: - - cron: '0 0 * * *' - -jobs: - export-scarf-data: - runs-on: ubuntu-latest - steps: - - uses: docker://scarf.docker.scarf.sh/scarf-sh/scarf-postgres-exporter:latest - env: - SCARF_API_TOKEN: ${{ secrets.SCARF_API_TOKEN }} - SCARF_ENTITY_NAME: Calcom - PSQL_CONN_STRING: ${{ secrets.PSQL_CONN_STRING }} diff --git a/.github/workflows/update-submodules.yml.old b/.github/workflows/update-submodules.yml.old deleted file mode 100644 index 87a8b7530..000000000 --- a/.github/workflows/update-submodules.yml.old +++ /dev/null @@ -1,26 +0,0 @@ -name: Update Calendso -on: - schedule: - - cron: "0 4 * * *" - workflow_dispatch: ~ - -jobs: - sync: - name: 'Submodules Sync' - runs-on: ubuntu-latest - defaults: - run: - shell: bash - steps: - - name: checkout - uses: actions/checkout@v3 - - - name: Git submodule update - run: | - git submodule update --remote --init - - - name: Commit - run: | - git config user.email "actions@github.com" - git config user.name "actions-user" - git commit -am "Auto updated submodule references" && git push || echo "No changes to commit" diff --git a/Dockerfile b/Dockerfile index 0c7173588..56ddb352a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,6 @@ RUN yarn prisma generate RUN yarn --cwd packages/embeds/embed-core workspace @calcom/embed-core run build RUN yarn --cwd apps/web workspace @calcom/web run build -# RUN yarn plugin import workspace-tools && \ -# yarn workspaces focus --all --production RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache FROM node:18 as builder-two @@ -73,9 +71,6 @@ ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ ENV NODE_ENV production EXPOSE 3000 -# HEALTHCHECK --interval=30s --timeout=30s --retries=5 \ -# CMD wget --spider http://localhost:3000 || exit 1 - HEALTHCHECK --interval=30s --timeout=30s --retries=5 \ CMD wget --spider $NEXT_PUBLIC_WEBAPP_URL || exit 1 diff --git a/bin/act b/bin/act deleted file mode 100755 index 8e8907fa0..000000000 Binary files a/bin/act and /dev/null differ