|
42 | 42 | outputs: |
43 | 43 | pr_number: ${{ steps.pr-info.outputs.pr_number }} |
44 | 44 | pr_url: ${{ steps.pr-info.outputs.pr_url }} |
| 45 | + pr_base_branch: ${{ steps.pr-info.outputs.pr_base_branch }} |
45 | 46 | force_deploy_mode: ${{ steps.check-force-deploy.outputs.force_deploy_mode }} |
46 | 47 | steps: |
47 | 48 | - name: Harden the runner (Audit all outbound calls) |
@@ -100,6 +101,7 @@ jobs: |
100 | 101 |
|
101 | 102 | core.setOutput('pr_number', prNumber); |
102 | 103 | core.setOutput('pr_url', prUrl); |
| 104 | + core.setOutput('pr_base_branch', pr.base.ref); |
103 | 105 | } else { |
104 | 106 | const allowedBranches = 'develop, main, hotfix/*, release/*, hotfix-release/*'; |
105 | 107 | core.setFailed(`No open PR found for branch ${branch} targeting an allowed base branch (${allowedBranches})`); |
@@ -244,13 +246,13 @@ jobs: |
244 | 246 | deploy-npm: |
245 | 247 | name: Deploy to NPM |
246 | 248 | uses: ./.github/workflows/deploy-npm.yml |
247 | | - needs: get-deploy-inputs |
| 249 | + needs: [find-pr, get-deploy-inputs] |
248 | 250 | if: ${{ inputs.deploy_to_npm }} |
249 | 251 | with: |
250 | 252 | environment: beta |
251 | 253 | bugsnag_release_stage: beta |
252 | 254 | version_suffix: ${{ needs.get-deploy-inputs.outputs.version_suffix }} |
253 | | - base_version: develop |
| 255 | + base_version: ${{ needs.find-pr.outputs.pr_base_branch }} |
254 | 256 | head_version: ${{ github.ref_name }} |
255 | 257 | trigger_source: ${{ needs.get-deploy-inputs.outputs.trigger_source }} |
256 | 258 | secrets: |
|
0 commit comments