diff --git a/.github/workflows/pr-review-hack.yml b/.github/workflows/pr-review-hack.yml index e12f086..295804e 100644 --- a/.github/workflows/pr-review-hack.yml +++ b/.github/workflows/pr-review-hack.yml @@ -20,6 +20,7 @@ jobs: outputs: author: ${{ steps.get-info.outputs.author }} actor: ${{ steps.get-info.outputs.actor }} + review_state: ${{ steps.get-info.outputs.review_state }} labels: ${{ steps.get-info.outputs.labels }} resource_url: ${{ steps.get-info.outputs.resource_url }} if: ${{ github.event.workflow_run.conclusion == 'success' }} @@ -29,10 +30,11 @@ jobs: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} run: | actor="${{ github.event.workflow_run.actor.login }}" - download_url="$(gh api "${{ github.event.workflow_run.artifacts_url }}" | jq -cr '.artifacts[] | select(.name == "pull_request_number") | .archive_download_url')" - curl -sSL -o pull_request_number.zip -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: Bearer $GITHUB_TOKEN" $download_url - unzip pull_request_number.zip - pull_request_number=$(cat pull_request_number) + download_url="$(gh api "${{ github.event.workflow_run.artifacts_url }}" | jq -cr '.artifacts[] | select(.name == "pull_request_info.json") | .archive_download_url')" + curl -sSL -o pull_request_info.zip -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: Bearer $GITHUB_TOKEN" $download_url + unzip pull_request_info.zip + pull_request_number="$(jq -cr '.issue.number' pull_request_info.json)" + issue_review_state="$(jq -cr '.review.state' pull_request_info.json)" pull_request="$(gh api "repos/${GITHUB_REPOSITORY}/pulls/${pull_request_number}")" author="$(echo $pull_request | jq -cr '.user.login')" author_association="$(echo $pull_request | jq -cr '.author_association')" @@ -43,6 +45,7 @@ jobs: echo "actor=${actor}" >> $GITHUB_OUTPUT echo "author=${author}" >> $GITHUB_OUTPUT echo "author_association=${author_association}" >> $GITHUB_OUTPUT + echo "review_state=${issue_review_state}" >> $GITHUB_OUTPUT echo "labels=${labels}" >> $GITHUB_OUTPUT echo "resource_url=${resource_url}" >> $GITHUB_OUTPUT call-pr-review-comment: @@ -55,4 +58,5 @@ jobs: author: ${{ needs.pr-info.outputs.author }} actor: ${{ needs.pr-info.outputs.actor }} labels: ${{ needs.pr-info.outputs.labels }} + review_state: ${{ needs.pr-info.outputs.review_state }} resource_url: ${{ needs.pr-info.outputs.resource_url }} diff --git a/.github/workflows/pr-reviews.yml b/.github/workflows/pr-reviews.yml index 7e6e666..7fe09a8 100644 --- a/.github/workflows/pr-reviews.yml +++ b/.github/workflows/pr-reviews.yml @@ -21,9 +21,9 @@ jobs: steps: - run: | echo "::notice:: Comment on PR #${{ github.event.pull_request.number }}" - echo "${{ github.event.pull_request.number }}" > pull_request_number - - name: Upload the PR number + jq -n --arg issue '${{ github.event.pull_request.number }}' --arg state '${{ github.event.review != null && github.event.review.state || '' }}' '{"issue": {"number": $issue }, "review": { "state": $state }}' > pull_request_info.json + - name: Upload the PR info uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 with: - name: pull_request_number - path: ./pull_request_number \ No newline at end of file + name: pull_request_info.json + path: ./pull_request_info.json \ No newline at end of file