diff --git a/.github/workflows/_vercel_deploy.yml b/.github/workflows/_vercel_deploy.yml index 98ab8dedbba..2a8d9d4dcba 100644 --- a/.github/workflows/_vercel_deploy.yml +++ b/.github/workflows/_vercel_deploy.yml @@ -21,9 +21,15 @@ on: shouldDeployPreview: type: boolean required: true + isDevelop: + type: boolean + required: true + githubRef: + type: string + required: true concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ inputs.githubRef }} cancel-in-progress: true jobs: @@ -37,7 +43,7 @@ jobs: explorer-prod: name: Vercel Explorer Production - if: github.ref_name == 'develop' && inputs.isExplorer + if: inputs.isDevelop && inputs.isExplorer uses: ./.github/workflows/apps-explorer.deploy.yml secrets: inherit with: @@ -53,7 +59,7 @@ jobs: ui-kit-prod: name: Vercel UI Kit Preview - if: github.ref_name == 'develop' && inputs.isAppsUiKit + if: inputs.isDevelop && inputs.isAppsUiKit uses: ./.github/workflows/apps-ui-kit.deploy.yml secrets: inherit with: @@ -69,7 +75,7 @@ jobs: wallet-dashboard-prod: name: Vercel Wallet Dashboard Production - if: github.ref_name == 'develop' && inputs.isWalletDashboard + if: inputs.isDevelop && inputs.isWalletDashboard uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml secrets: inherit with: @@ -85,7 +91,7 @@ jobs: apps-backend-prod: name: Vercel apps-backend Production - if: github.ref_name == 'develop' && inputs.isAppsBackend + if: inputs.isDevelop && inputs.isAppsBackend uses: ./.github/workflows/apps-backend.deploy.yml secrets: inherit with: diff --git a/.github/workflows/hierarchy.yml b/.github/workflows/hierarchy.yml index a58020d2c3e..47d92c4ce92 100644 --- a/.github/workflows/hierarchy.yml +++ b/.github/workflows/hierarchy.yml @@ -165,6 +165,8 @@ jobs: isAppsBackend: ${{ needs.diff.outputs.isAppsBackend == 'true' }} isAppsUiKit: ${{ needs.diff.outputs.isAppsUiKit == 'true' }} isWalletDashboard: ${{ needs.diff.outputs.isWalletDashboard == 'true' }} + isDevelop: ${{ github.ref_name == 'develop' }} + githubRef: ${{ github.event.pull_request.number || github.ref }} ledgernano: if: (!cancelled() && !failure()) && needs.diff.outputs.isLedgerjs == 'true' && github.event.pull_request.draft == false