From 1bb6ece68bf86a2c9f506350c5542b92e78386a5 Mon Sep 17 00:00:00 2001 From: cberg-aot <93226309+cberg-aot@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:49:36 -0700 Subject: [PATCH] Fix/release event add pr (#1616) --- .github/workflows/merge.yml | 3 --- .github/workflows/release.yml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 01c9f8fd1..97ce93ebb 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -5,10 +5,7 @@ on: branches: [main] paths-ignore: - '*.md' - - '.github/**' - 'common/graphics/**' - - '!.github/workflows/deploy.yml' - - '!.github/workflows/merge.yml' workflow_dispatch: inputs: pr: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c7368475..90c3f905f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Get PR Number From Event if: ${{ github.event_name == 'release' }} id: pr_no - uses: bcgov-nr/action-get-pr@v0.0.1 + uses: bcgov-nr/action-get-pr@main - name: PR Number id: pr run: echo pr=${{ steps.pr_no.outputs.pr || inputs.pr}} >> $GITHUB_OUTPUT