Dispatch tests after predictable conflict resolutions

Author: coisa

.github/actions/github/resolve-predictable-conflicts/run.sh

@@ -58,6 +58,32 @@ is_allowed_conflict_scope() {
     return 0
 }
 
+dispatch_required_tests() {
+    local head_ref="$1"
+
+    if ! gh workflow view tests.yml >/dev/null 2>&1; then
+        append_summary "  - tests dispatch skipped: tests.yml workflow was not found"
+
+        return 0
+    fi
+
+    if gh workflow run tests.yml --ref "${head_ref}" -f max-outdated=-1 -f publish-required-statuses=true >/dev/null 2>&1; then
+        append_summary "  - tests dispatch requested with required status mirroring"
+
+        return 0
+    fi
+
+    if gh workflow run tests.yml --ref "${head_ref}" >/dev/null 2>&1; then
+        append_summary "  - tests dispatch requested without required status mirroring"
+
+        return 0
+    fi
+
+    append_summary "  - failed: resolved branch was pushed, but tests.yml could not be dispatched"
+
+    return 1
+}
+
 resolve_pull_request() {
     local number="$1"
     local title="$2"
@@ -162,6 +188,13 @@ resolve_pull_request() {
     git -C "${workdir}/repo" commit -m "Resolve predictable conflicts with ${base_ref}" >/dev/null 2>&1
     git -C "${workdir}/repo" push origin "HEAD:${head_ref}" >/dev/null 2>&1
     append_summary "  - resolved: pushed an automatic conflict-resolution commit for \`${title}\`"
+
+    if ! dispatch_required_tests "${head_ref}"; then
+        failed_count=$((failed_count + 1))
+
+        return
+    fi
+
     resolved_count=$((resolved_count + 1))
 }
 

.github/workflows/auto-resolve-conflicts.yml

@@ -31,6 +31,7 @@ on:
         types: [opened, reopened, synchronize, ready_for_review]
 
 permissions:
+    actions: write
     contents: write
     pull-requests: write
 

docs/advanced/branch-protection-and-bot-commits.rst

@@ -118,7 +118,10 @@ the only conflicts are ``.github/wiki`` pointer drift and/or ``CHANGELOG.md``
 ``Unreleased`` drift. It keeps pull request wiki preview pointers on the branch
 side and replays branch-only changelog entries into the current base
 ``Unreleased`` section, which avoids placing new entries under a freshly
-published release after ``main`` moved.
+published release after ``main`` moved. Because those automatic resolutions are
+also pushed with the built-in workflow token, the workflow dispatches
+``tests.yml`` for the refreshed branch after a successful push so required test
+statuses can be reported for the new commit.
 
 At a high level, the workflows need permission to read repository contents,
 write generated preview commits, update pull request comments, and publish Pages
@@ -150,6 +153,11 @@ pointer updates, ``actions: write`` to dispatch ``tests.yml`` after bot-authored
 pointer commits, and ``pull-requests: read`` to inspect pull request metadata
 safely.
 
+``auto-resolve-conflicts.yml`` keeps ``contents: write`` so it can push
+predictable conflict-resolution commits, ``pull-requests: write`` so it can
+inspect pull request state through GitHub tooling, and ``actions: write`` so it
+can dispatch ``tests.yml`` after it pushes a bot-authored resolution commit.
+
 ``wiki-maintenance-entry.yml`` and ``wiki-maintenance.yml`` keep
 ``contents: write`` for wiki publication and cleanup tasks, and
 ``pull-requests: read`` on jobs that need to distinguish merged, closed, and

resources/github-actions/auto-resolve-conflicts.yml

@@ -23,6 +23,7 @@ on:
         default: ''
 
 permissions:
+  actions: write
   contents: write
   pull-requests: write