From f7eda5aa3a3dd2be772af2b947ca2463120c546f Mon Sep 17 00:00:00 2001 From: zomars Date: Fri, 24 Feb 2023 13:16:20 -0700 Subject: [PATCH] Moved cache-db to yarn-build --- .github/actions/yarn-build/action.yml | 39 ++++++++++++++++++++++---- .github/workflows/production-build.yml | 3 -- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/actions/yarn-build/action.yml b/.github/actions/yarn-build/action.yml index 89e55cb2d4..19c00ffc12 100644 --- a/.github/actions/yarn-build/action.yml +++ b/.github/actions/yarn-build/action.yml @@ -63,13 +63,42 @@ inputs: runs: using: "composite" steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/yarn-install + - uses: ./.github/actions/cache-db + id: cache-db + with: + DATABASE_URL: ${{ env.DATABASE_URL }} - uses: ./.github/actions/cache-build id: prod-build-cache - name: Next.js production build - if: steps.prod-build-cache.outputs.cache-hit != 'true' + if: steps.cache-db.outputs.cache-hit != 'true' shell: bash + env: + DATABASE_URL: ${{ inputs.DATABASE_URL }} + NEXT_PUBLIC_WEBAPP_URL: ${{ inputs.NEXT_PUBLIC_WEBAPP_URL }} + NEXT_PUBLIC_WEBSITE_URL: ${{ inputs.NEXT_PUBLIC_WEBSITE_URL }} + NEXTAUTH_SECRET: ${{ inputs.NEXTAUTH_SECRET }} + GOOGLE_API_CREDENTIALS: ${{ inputs.GOOGLE_API_CREDENTIALS }} + GOOGLE_LOGIN_ENABLED: ${{ inputs.GOOGLE_LOGIN_ENABLED }} + CALENDSO_ENCRYPTION_KEY: ${{ inputs.CALENDSO_ENCRYPTION_KEY }} + DAILY_API_KEY: ${{ inputs.DAILY_API_KEY }} + NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ inputs.NEXT_PUBLIC_STRIPE_PUBLIC_KEY }} + NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE }} + NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE }} + NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE }} + NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE: ${{ inputs.NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE }} + NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN: ${{ inputs.NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN }} + STRIPE_PRIVATE_KEY: ${{ inputs.STRIPE_PRIVATE_KEY }} + STRIPE_CLIENT_ID: ${{ inputs.STRIPE_CLIENT_ID }} + STRIPE_WEBHOOK_SECRET: ${{ inputs.STRIPE_WEBHOOK_SECRET }} + STRIPE_PRO_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_PRO_PLAN_PRODUCT_ID }} + STRIPE_PREMIUM_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_PREMIUM_PLAN_PRODUCT_ID }} + STRIPE_FREE_PLAN_PRODUCT_ID: ${{ inputs.STRIPE_FREE_PLAN_PRODUCT_ID }} + PAYMENT_FEE_PERCENTAGE: ${{ inputs.PAYMENT_FEE_PERCENTAGE }} + PAYMENT_FEE_FIXED: ${{ inputs.PAYMENT_FEE_FIXED }} + SAML_DATABASE_URL: ${{ inputs.SAML_DATABASE_URL }} + SAML_ADMINS: ${{ inputs.SAML_ADMINS }} + NEXTAUTH_URL: ${{ inputs.NEXTAUTH_URL }} + run: yarn db-seed env: DATABASE_URL: ${{ inputs.DATABASE_URL }} NEXT_PUBLIC_WEBAPP_URL: ${{ inputs.NEXT_PUBLIC_WEBAPP_URL }} @@ -99,6 +128,4 @@ runs: NEXT_PUBLIC_IS_E2E: ${{ inputs.NEXT_PUBLIC_IS_E2E }} TURBO_TOKEN: ${{ inputs.TURBO_TOKEN }} TURBO_TEAM: ${{ inputs.TURBO_TEAM }} - run: | - yarn db-seed - yarn build + run: yarn build diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml index 6c0c2658e5..4a575ab465 100644 --- a/.github/workflows/production-build.yml +++ b/.github/workflows/production-build.yml @@ -49,9 +49,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/actions/yarn-install - - uses: ./.github/actions/cache-db - with: - DATABASE_URL: ${{ env.DATABASE_URL }} - uses: ./.github/actions/yarn-build with: # GitHub Composite actions cannot read secrets, we have to pass them in here