From 27ee091d49abc097ebc41e441b8bd6336cc626df Mon Sep 17 00:00:00 2001 From: Levente Balogh Date: Tue, 15 Feb 2022 11:10:44 +0100 Subject: [PATCH] Chore: fix Levitate reporting issues with missing PR numbers (#45381) * chore: persist the PR number in the Levitate workflow artifact This is going to be used later in the reporting workflow, as for 3rd party (fork) PRs Github doesn't correctly populate the `workflow_run` context (the PR number is missing from it). * chore: use the PR number from the artifact for Levitate reporting --- .../workflows/detect-breaking-changes-build.yml | 2 +- .../workflows/detect-breaking-changes-report.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/detect-breaking-changes-build.yml b/.github/workflows/detect-breaking-changes-build.yml index 333061c3c1d..41d3a05aa39 100644 --- a/.github/workflows/detect-breaking-changes-build.yml +++ b/.github/workflows/detect-breaking-changes-build.yml @@ -128,7 +128,7 @@ jobs: - name: Persisting the check output run: | mkdir -p ./levitate - echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\" }" > ./levitate/result.json + echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json - name: Upload check output as artifact uses: actions/upload-artifact@v2 diff --git a/.github/workflows/detect-breaking-changes-report.yml b/.github/workflows/detect-breaking-changes-report.yml index 2611563f4fd..f7a096a288e 100644 --- a/.github/workflows/detect-breaking-changes-report.yml +++ b/.github/workflows/detect-breaking-changes-report.yml @@ -82,7 +82,7 @@ jobs: if: ${{ steps.levitate-run.outputs.exit_code == 1 }} uses: marocchino/sticky-pull-request-comment@v2 with: - number: ${{ github.event.workflow_run.pull_requests[0].number }} + number: ${{ steps.levitate-run.outputs.pr_number }} message: | ⚠️   **Possible breaking changes** @@ -97,7 +97,7 @@ jobs: if: ${{ steps.levitate-run.outputs.exit_code == 0 }} uses: marocchino/sticky-pull-request-comment@v2 with: - number: ${{ github.event.workflow_run.pull_requests[0].number }} + number: ${{ steps.levitate-run.outputs.pr_number }} delete: true # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before @@ -108,8 +108,8 @@ jobs: with: payload: | { - "pr_link": "${{ github.event.workflow_run.pull_requests[0].html_url }}", - "pr_number": "${{ github.event.workflow_run.pull_requests[0].number }}", + "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}", + "pr_number": "${{ steps.levitate-run.outputs.pr_number }}", "job_link": "${{ steps.levitate-run.outputs.job_link }}", "reporting_job_link": "${{ github.event.workflow_run.html_url }}", "message": "${{ steps.levitate-run.outputs.message }}" @@ -121,7 +121,7 @@ jobs: if: ${{ steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 }} uses: actions/github-script@v5 env: - PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }} + PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }} with: github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} script: | @@ -136,7 +136,7 @@ jobs: if: ${{ steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 }} uses: actions/github-script@v5 env: - PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }} + PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }} with: github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} script: | @@ -153,7 +153,7 @@ jobs: if: ${{ steps.levitate-run.outputs.exit_code == 1 }} uses: actions/github-script@v5 env: - PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }} + PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }} with: github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} script: | @@ -169,7 +169,7 @@ jobs: if: ${{ steps.levitate-run.outputs.exit_code == 0 }} uses: actions/github-script@v5 env: - PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }} + PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }} with: github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} script: |