Scheduling infrastructure for absolutely everyone.
refactor: Add dedicated setup-db job to eliminate cache race condition (#26171)
Keith Williams054a0fa7dbb1
diff --git a/.github/actions/cache-db/action.yml b/.github/actions/cache-db/action.ymlindex 32b9b0c083b..dff9ba52e80 100644--- a/.github/actions/cache-db/action.yml+++ b/.github/actions/cache-db/action.yml@@ -7,6 +7,10 @@ inputs:path:required: falsedefault: "backups/backup.sql"+ COMMIT_SHA:+ required: false+ default: ""+ description: "Commit SHA to include in cache key (passed from workflow)"runs:using: "composite"steps:@@ -17,7 +21,7 @@ runs:cache-name: cache-dbkey-1: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}key-2: ${{ github.event.pull_request.number || github.ref }}- key-3: ${{ github.event.pull_request.head.sha }}+ key-3: ${{ inputs.COMMIT_SHA || github.event.pull_request.head.sha || github.sha }}DATABASE_URL: ${{ inputs.DATABASE_URL }}DATABASE_DIRECT_URL: ${{ inputs.DATABASE_URL }}E2E_TEST_CALCOM_QA_EMAIL: ${{ inputs.E2E_TEST_CALCOM_QA_EMAIL }}diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.ymlindex d85f6d99feb..65d098c438a 100644--- a/.github/workflows/e2e.yml+++ b/.github/workflows/e2e.yml@@ -5,7 +5,6 @@ permissions:actions: writecontents: readenv:- NODE_OPTIONS: --max-old-space-size=4096ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}DAILY_API_KEY: ${{ secrets.CI_DAILY_API_KEY }}@@ -15,11 +14,11 @@ env:E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}E2E_TEST_MAILHOG_ENABLED: ${{ vars.E2E_TEST_MAILHOG_ENABLED }}- GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}EMAIL_SERVER_HOST: ${{ secrets.CI_EMAIL_SERVER_HOST }}EMAIL_SERVER_PORT: ${{ secrets.CI_EMAIL_SERVER_PORT }}EMAIL_SERVER_USER: ${{ secrets.CI_EMAIL_SERVER_USER }}EMAIL_SERVER_PASSWORD: ${{ secrets.CI_EMAIL_SERVER_PASSWORD}}+ GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}GOOGLE_LOGIN_ENABLED: ${{ vars.CI_GOOGLE_LOGIN_ENABLED }}NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}@@ -30,6 +29,7 @@ env:NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}NEXT_PUBLIC_WEBAPP_URL: ${{ vars.CI_NEXT_PUBLIC_WEBAPP_URL }}NEXT_PUBLIC_WEBSITE_URL: ${{ vars.CI_NEXT_PUBLIC_WEBSITE_URL }}+ NODE_OPTIONS: --max-old-space-size=4096PAYMENT_FEE_FIXED: ${{ vars.CI_PAYMENT_FEE_FIXED }}PAYMENT_FEE_PERCENTAGE: ${{ vars.CI_PAYMENT_FEE_PERCENTAGE }}SAML_ADMINS: ${{ secrets.CI_SAML_ADMINS }}diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.ymlindex ddfdec13814..968070e169f 100644--- a/.github/workflows/pr.yml+++ b/.github/workflows/pr.yml@@ -139,9 +139,18 @@ jobs:uses: ./.github/workflows/unit-tests.ymlsecrets: inherit+ setup-db:+ name: Setup Database+ needs: [prepare, deps]+ if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}+ uses: ./.github/workflows/setup-db.yml+ with:+ COMMIT_SHA: ${{ needs.prepare.outputs.commit-sha }}+ secrets: inherit+build-api-v1:name: Production builds- needs: [prepare, deps]+ needs: [prepare, deps, setup-db]if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/api-v1-production-build.ymlsecrets: inherit@@ -183,42 +192,42 @@ jobs:integration-test:name: Tests- needs: [prepare, build, build-api-v1]- if: ${{ needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}+ needs: [prepare, build, setup-db]+ if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/integration-tests.ymlsecrets: inherite2e:name: Tests- needs: [prepare, build, build-api-v1]+ needs: [prepare, build, setup-db]if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/e2e.ymlsecrets: inherite2e-api-v2:name: Tests- needs: [prepare, build-api-v2]+ needs: [prepare, setup-db]if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/e2e-api-v2.ymlsecrets: inherite2e-app-store:name: Tests- needs: [prepare, build]+ needs: [prepare, build, setup-db]if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/e2e-app-store.ymlsecrets: inherite2e-embed:name: Tests- needs: [prepare, build]+ needs: [prepare, build, setup-db]if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/e2e-embed.ymlsecrets: inherite2e-embed-react:name: Tests- needs: [prepare, build]+ needs: [prepare, build, setup-db]if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}uses: ./.github/workflows/e2e-embed-react.ymlsecrets: inherit@@ -243,6 +252,7 @@ jobs:build-atoms,build-docs,build-companion,+ setup-db,e2e,e2e-api-v2,e2e-embed,@@ -266,6 +276,7 @@ jobs:needs.build-api-v2.result != 'success' ||needs.build-atoms.result != 'success' ||needs.build-docs.result != 'success' ||+ needs.setup-db.result != 'success' ||needs.integration-test.result != 'success' ||needs.e2e.result != 'success' ||needs.e2e-api-v2.result != 'success' ||diff --git a/.github/workflows/setup-db.yml b/.github/workflows/setup-db.ymlnew file mode 100644index 00000000000..53a29936eee--- /dev/null+++ b/.github/workflows/setup-db.yml@@ -0,0 +1,54 @@+name: Setup Database++on:+ workflow_call:+ inputs:+ COMMIT_SHA:+ required: false+ type: string+ default: ""+ description: "Commit SHA to include in cache key"++permissions:+ contents: read++env:+ CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}+ DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}+ DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}+ E2E_TEST_CALCOM_QA_EMAIL: ${{ secrets.E2E_TEST_CALCOM_QA_EMAIL }}+ E2E_TEST_CALCOM_QA_PASSWORD: ${{ secrets.E2E_TEST_CALCOM_QA_PASSWORD }}+ E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ secrets.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}+ GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}+ TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}+ TURBO_TEAM: ${{ secrets.TURBO_TEAM }}++jobs:+ setup-db:+ name: Setup Database+ runs-on: buildjet-4vcpu-ubuntu-2204+ timeout-minutes: 15+ services:+ postgres:+ image: postgres:13+ credentials:+ username: ${{ secrets.DOCKERHUB_USERNAME }}+ password: ${{ secrets.DOCKERHUB_TOKEN }}+ env:+ POSTGRES_USER: postgres+ POSTGRES_PASSWORD: postgres+ POSTGRES_DB: calendso+ options: >-+ --health-cmd pg_isready+ --health-interval 10s+ --health-timeout 5s+ --health-retries 5+ ports:+ - 5432:5432+ steps:+ - uses: actions/checkout@v4+ - uses: ./.github/actions/dangerous-git-checkout+ - uses: ./.github/actions/yarn-install+ - uses: ./.github/actions/cache-db+ with:+ COMMIT_SHA: ${{ inputs.COMMIT_SHA || github.sha }}