Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/workflows/merge-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ on:
permissions:
contents: write
pull-requests: write
concurrency:
# Every run rescans all open PRs, so overlapping runs are pure duplicate work
# and the newest run always sees the freshest state. Do not cancel in
# progress: a run cancelled midway through the merge API call is worse than a
# redundant one.
group: merge-pull-request
cancel-in-progress: false
jobs:
merge_pull_request:
# A triggering workflow that failed, was cancelled or was skipped left the
Expand All @@ -59,6 +52,15 @@ jobs:
if: |
github.event_name != 'workflow_run'
|| github.event.workflow_run.conclusion == 'success'
concurrency:
# Every run rescans all open PRs, so overlapping runs are pure duplicate
# work and the newest run always sees the freshest state. Do not cancel
# in progress: a run cancelled midway through the merge API call is worse
# than a redundant one. This is set on the job rather than the workflow
# so that a run whose `if` skips the job never joins the group, where it
# would replace (cancel) another PR's pending merge run.
group: merge-pull-request
cancel-in-progress: false
uses: legendu-net/.github/.github/workflows/merge-pr.yaml@main
with:
dry_run: ${{ inputs.dry_run || false }}
Expand Down
Loading