From b8919a7cc1ae5a57a3363031297fc3261b9decd5 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 23 Nov 2022 19:14:41 -0800 Subject: [PATCH] pr command action fixes (#8591) --- .github/workflows/build.yml | 4 ++-- .github/workflows/pr_comment.yml | 36 +++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55f500cde2..0102ab94e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,8 @@ on: jobs: build: - # Only run on PRs if the source branch is on someone else's repo and the pr is not labeled with `build-pr-jar` - if: github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name + # Run on all label events (won't be duplicated) or all push events or on PR syncs not from the same repo + if: (github.event_name == 'pull_request' && github.event.action == 'labeled') || github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/pr_comment.yml b/.github/workflows/pr_comment.yml index f0ca9b57a3..fd73250ab3 100644 --- a/.github/workflows/pr_comment.yml +++ b/.github/workflows/pr_comment.yml @@ -24,8 +24,8 @@ jobs: # Modified extensively by Machine_Maker script: | async function updatePR(owner, repo, issue_number, purpose, body) { - const { data } = await github.rest.issues.get({owner, repo, issue_number}); - core.info(JSON.stringify(data, null, 2)); + const { data } = await github.rest.issues.get({ owner, repo, issue_number }); + core.debug(JSON.stringify(data, null, 2)); const marker = ``; @@ -37,23 +37,35 @@ jobs: } core.info(`Updating the text body of PR #${issue_number} in ${owner}/${repo}`); - await github.rest.issues.update({owner, repo, issue_number, body: new_body}); + await github.rest.issues.update({ owner, repo, issue_number, body: new_body }); } - const {owner, repo} = context.repo; - const run_id = ${{github.event.workflow_run.id}}; + const { owner, repo } = context.repo; + const run_id = ${{ github.event.workflow_run.id }}; const repo_id = ${{ github.event.repository.id }}; + + let pulls = []; + const event_type = "${{ github.event.workflow_run.event}}"; + if (event_type === "push") { // if push, it's from the same repo which means `pull_requests` is populated + pulls = ${{ toJSON(github.event.workflow_run.pull_requests) }}; + } else { + const pr_branch = "${{ github.event.workflow_run.head_branch }}"; + const pr_sha = "${{ github.event.workflow_run.head_sha }}"; + const pr_owner = "${{ github.event.workflow_run.head_repository.owner.login }}"; + const { data } = await github.rest.pulls.list({ owner, repo, head: `${pr_owner}:${pr_branch}`, state: "open" }); + core.debug(JSON.stringify(data, null, 2)); + pulls = data.filter((pr) => pr.head.sha === pr_sha && pr.labels.find((l) => l.name === "build-pr-jar")); + } - const pull_requests = ${{ toJSON(github.event.workflow_run.pull_requests) }}; - if (!pull_requests.length) { + if (!pulls.length) { return core.notice("This workflow doesn't have any pull requests!"); + } else if (pulls.length > 1) { + core.info(JSON.stringify(pulls, null, 2)); + return core.error("Found multiple matching PRs"); } - const pull_request = pull_requests.find((pr) => pr.base.repo.id === repo_id); - if (!pull_request) { - return core.notice("This workflow doesn't match any pull request!"); - } + const pull_request = pulls[0]; - const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {owner, repo, run_id}); + const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, { owner, repo, run_id }); if (!artifacts.length) { return core.info("Skipping comment due to no artifact found"); }