From da4e1b55a823ce6ebaccb48c293f94ab90335bba Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 18 Sep 2026 18:07:43 -0400
Subject: [PATCH] Publish report: no PR comment on dispatch runs; append the
 log before commenting

A workflow_dispatch runs from master's head. That commit's PR merged
something unrelated, so looking the PR up by commit attached a failed
elsewhen report to #515, whose merge had nothing to do with elsewhen.
Dispatch runs now go to the log only. The log append also moves ahead
of the PR comment so the record exists by the time anyone follows the
comment to it.
---
 .github/workflows/publish.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2028b7a..75f236f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -277,17 +277,6 @@ jobs:
             "Commit " + .commit[0:7] + " · [run](" + .run + ")"
           ' publish-record.json > comment.md
           cat comment.md
-      - name: Comment on the merged PR
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          pr=$(gh api "repos/${{ github.repository }}/commits/${{ github.sha }}/pulls" --jq '.[0].number // empty')
-          if [[ -n "$pr" ]]; then
-            gh pr comment "$pr" -R "${{ github.repository }}" --body-file comment.md
-            echo "commented on #$pr"
-          else
-            echo "no PR for ${{ github.sha }} (manual dispatch?); skipping PR comment"
-          fi
       - name: Append to the publish log in the bucket
         env:
           RCLONE_CONFIG_R2_TYPE: s3
@@ -305,6 +294,21 @@ jobs:
           ./rclone copyto publish-log.jsonl R2:omarchy-pkgs/publish-log.jsonl --s3-no-head
           echo "log now has $(wc -l < publish-log.jsonl) entries"
 
+      - name: Comment on the merged PR
+        # Only for a push: the merge commit names its PR. A dispatch runs
+        # from master's head, whose PR merged something else entirely, so
+        # commenting there would attach this run's report to the wrong PR.
+        if: github.event_name == 'push'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          pr=$(gh api "repos/${{ github.repository }}/commits/${{ github.sha }}/pulls" --jq '.[0].number // empty')
+          if [[ -n "$pr" ]]; then
+            gh pr comment "$pr" -R "${{ github.repository }}" --body-file comment.md
+            echo "commented on #$pr"
+          else
+            echo "no PR for ${{ github.sha }} (manual dispatch?); skipping PR comment"
+          fi
   result:
     needs: [changes, publish]
     if: always()