diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index cb96660ae..98e0ce6ce 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -30,14 +30,13 @@ jobs: timeout-minutes: 1 steps: # Get PR number for squash merges to main - - name: PR Number + - name: Get PR Number From Event if: ${{ github.event_name == 'push' }} - id: pr + id: pr_no uses: bcgov-nr/action-get-pr@v0.0.1 - name: PR Number - if: ${{ github.event_name != 'push' }} id: pr - run: echo ${{inputs.pr}} >> $GITHUB_OUTPUT + run: echo ${{ steps.pr_no.outputs.pr || inputs.pr}} deploys-test: name: Deploys (Test) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62a32236a..e8b8fb42d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,6 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 1 steps: - # Get PR number for squash merges to main - name: Release Name id: release-name run: |