diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index cea6851..ce49e4a 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -4,7 +4,7 @@ on: merge_group: pull_request: push: - branches: [main] + # branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -20,7 +20,13 @@ jobs: run: | echo "github.event_name: ${{ github.event_name }}" echo "github.event.action: ${{ github.event.action }}" - + + - name: Dump GitHub Context.Event + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: | + echo "${GITHUB_CONTEXT}" | jq . + # Test for PR, merge queue and merge to main get-pr: name: Get PR number diff --git a/action.yml b/action.yml index cca34c8..bb8bdf9 100644 --- a/action.yml +++ b/action.yml @@ -29,8 +29,6 @@ runs: - id: vars shell: bash run: | - set -eux - # Get PR number (different process for merge queue) if [ ${{ github.event_name }} == 'pull_request' ] then @@ -43,7 +41,15 @@ runs: elif [ ${{ github.event_name }} == 'push' ] then echo "Event type: push" - pr=$(echo ${{ github.event.head_commit.message }} |( grep -Eo "pr-[0-9]+" || true )| cut -d '-' -f2) + # HEAD=$(git log main --oneline | head -n1 | awk '{print $1}') + HEAD=${{ github.event.after }} + pr=$(\ + curl -sL -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ github.token }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/${{ github.repository }}/commits/${HEAD}/pulls \ + | jq .[0].number + ) + if [ -z "${pr}" ] then echo "No PR number found. Was this push triggered by a squashed PR merge?" @@ -54,7 +60,7 @@ runs: fi # Validate PR number - if [ ! "${PR_NO}" =~ ^[0-9]+$ ]; then + if [[ ! "${pr}" =~ ^[0-9]+$ ]]; then echo "PR number format incorrect: ${pr}" exit 1 fi