From 23e4f242e9909cb233509fbca0143a967ea4f1f6 Mon Sep 17 00:00:00 2001 From: Javier Bullrich Date: Tue, 16 Apr 2024 11:42:08 +0200 Subject: [PATCH] fixed wrong kind of event field --- .github/workflows/review-trigger.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/review-trigger.yml b/.github/workflows/review-trigger.yml index f4ca6bfb7572..184afa52c020 100644 --- a/.github/workflows/review-trigger.yml +++ b/.github/workflows/review-trigger.yml @@ -25,8 +25,8 @@ jobs: id: comments run: | echo "github.event.number is ${{ github.event.number }} and github.event.pull_request.number is ${{ github.event.pull_request.number }}" - echo "bodies=$(gh pr view ${{ github.event.number }} --repo ${{ github.repository }} --json comments --jq '[.comments[].body]')" >> "$GITHUB_OUTPUT" - echo "reviews=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.number }}/reviews --jq '[.[].state]')" >> "$GITHUB_OUTPUT"" + echo "bodies=$(gh pr view ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --json comments --jq '[.comments[].body]')" >> "$GITHUB_OUTPUT" + echo "reviews=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews --jq '[.[].state]')" >> "$GITHUB_OUTPUT"" env: GH_TOKEN: ${{ github.token }} - name: Fail when author pushes new code @@ -40,11 +40,11 @@ jobs: run: | echo "User's association is ${{ github.event.pull_request.author_association }}" # We get the list of reviewers who approved the PR - REVIEWERS=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.number }}/reviews \ + REVIEWERS=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews \ --jq '{reviewers: [.[] | select(.state == "APPROVED") | .user.login]}') # We request them to review again - echo $REVIEWERS | gh api --method POST repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers --input - + echo $REVIEWERS | gh api --method POST repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers --input - echo "::error::Project needs to be reviewed again" exit 1 @@ -54,7 +54,7 @@ jobs: # If the previous step failed and github-actions hasn't commented yet we comment instructions if: failure() && !contains(fromJson(steps.comments.outputs.bodies), 'Review required! Latest push from author must always be reviewed') run: | - gh pr comment ${{ github.event.number }} --repo ${{ github.repository }} --body "Review required! Latest push from author must always be reviewed" + gh pr comment ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --body "Review required! Latest push from author must always be reviewed" env: GH_TOKEN: ${{ github.token }} COMMENTS: ${{ steps.comments.outputs.users }}