diff --git a/.github/workflows/pr-comment-build-dispatcher.yaml b/.github/workflows/pr-comment-build-dispatcher.yaml index a3ab744540..4d334d2601 100644 --- a/.github/workflows/pr-comment-build-dispatcher.yaml +++ b/.github/workflows/pr-comment-build-dispatcher.yaml @@ -7,7 +7,7 @@ permissions: pull-requests: write concurrency: - group: ${{ github.workflow }}-pr-command-${{ github.head_ref || github.ref_name }} + group: ${{ github.workflow }}-pr-command-${{ github.event.issue.pull_request.number }} cancel-in-progress: true jobs: @@ -49,10 +49,16 @@ jobs: $res + - name: Post a link to the workflow run to the PR + uses: mshick/add-pr-comment@v2 + with: + issue: ${{ github.event.issue.pull_request.number }} + message: "Build action triggered: [${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" + update_sdk: needs: check_maintainer_membership - if: ( always() && needs.check_maintainer_membership.result == 'success' - && contains(github.event.comment.body, '/update-sdk') ) + if: ( needs.check_maintainer_membership.result == 'success' + && contains(github.event.comment.body, '/update-sdk') ) name: "Build an updated SDK container" # SDK build needs access to bincache ssh secret secrets: inherit @@ -60,8 +66,8 @@ jobs: build_image: needs: [ check_maintainer_membership, update_sdk ] - if: ( always() && needs.check_maintainer_membership.result == 'success' - && ( contains(github.event.comment.body, '/build-image') || needs.update_sdk.result == 'success' ) ) + if: ( needs.check_maintainer_membership.result == 'success' + && ( contains(github.event.comment.body, '/build-image') || needs.update_sdk.result == 'success' ) ) name: "Build the OS image" uses: ./.github/workflows/ci.yaml with: diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml index 53846d852a..8f4234a5e7 100644 --- a/.github/workflows/run-kola-tests.yaml +++ b/.github/workflows/run-kola-tests.yaml @@ -351,8 +351,9 @@ jobs: cat test-results.md >> "$GITHUB_STEP_SUMMARY" - - name: If started from a PR, post test summary to PR - if: ${{ github.event_name == 'pull_request' }} + - name: If started from a PR event or a PR comment command, post test summary to PR + if: ${{ github.event_name == 'pull_request' || github.event.issue.pull_request }} uses: mshick/add-pr-comment@v2 with: + issue: ${{ github.event.pull_request.number || github.event.issue.pull_request.number }} message-path: "scripts/test-results.md"