From 2bcd502c8f42ddc6f5e7a4f59bc2ecfeb904bcca Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Sun, 28 Jan 2024 23:14:34 +0000 Subject: [PATCH 1/2] Properly get PR number for merge group --- .github/workflows/minimal-tests-bindings.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/minimal-tests-bindings.yml b/.github/workflows/minimal-tests-bindings.yml index 4f25afd580..00c024a7cf 100644 --- a/.github/workflows/minimal-tests-bindings.yml +++ b/.github/workflows/minimal-tests-bindings.yml @@ -19,6 +19,14 @@ jobs: grace-period: runs-on: ubuntu-latest steps: + # This workflow runs for both merge_group and pull_request + # We need a way to get the pull request number that works for both cases. + # The action can do that. + - id: get-pr-number + uses: mgaitan/gha-get-pr-number@main + # This job also outputs the PR number + - run: echo "pr-number=${{ steps.get-pr-number.outputs.number }}" + # Sleep for 2 mins - run: sleep 120 # Figure out binding PRs. @@ -26,7 +34,7 @@ jobs: needs: grace-period uses: ./.github/workflows/pr-binding-refs.yml with: - pull_request: ${{ github.event.pull_request.number }} + pull_request: ${{ needs.grace-period.outputs.pr-number }} minimal-tests-openjdk: needs: binding-refs From 2153c5091e721eb77a89ae0799b96e994f1695ca Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Mon, 29 Jan 2024 03:17:21 +0000 Subject: [PATCH 2/2] Fix: echo to $GITHUB_OUTPUT --- .github/workflows/minimal-tests-bindings.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/minimal-tests-bindings.yml b/.github/workflows/minimal-tests-bindings.yml index 00c024a7cf..098f90a2a7 100644 --- a/.github/workflows/minimal-tests-bindings.yml +++ b/.github/workflows/minimal-tests-bindings.yml @@ -18,6 +18,8 @@ jobs: # This step allows 2mins before we check comments for binding repos/refs. grace-period: runs-on: ubuntu-latest + outputs: + pr-number: ${{ steps.set-output.outputs.pr-number }} steps: # This workflow runs for both merge_group and pull_request # We need a way to get the pull request number that works for both cases. @@ -25,7 +27,8 @@ jobs: - id: get-pr-number uses: mgaitan/gha-get-pr-number@main # This job also outputs the PR number - - run: echo "pr-number=${{ steps.get-pr-number.outputs.number }}" + - id: set-output + run: echo "pr-number=${{ steps.get-pr-number.outputs.number }}" >> $GITHUB_OUTPUT # Sleep for 2 mins - run: sleep 120