From 6d372ade0f5715d52fe057dee082079acca4549b Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Sat, 28 Dec 2024 00:03:42 -0500
Subject: [PATCH] Meta: Propagate the PR merge commit

---
 .github/workflows/publish-pr.yml | 31 ++++++++++++++++++-------------
 .github/workflows/render-pr.yml  |  6 ++++--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/publish-pr.yml b/.github/workflows/publish-pr.yml
index be96d04..cd5decd 100644
--- a/.github/workflows/publish-pr.yml
+++ b/.github/workflows/publish-pr.yml
@@ -57,23 +57,28 @@ jobs:
       run: rm -rf result && mkdir -p result
     - run: unzip -o result.zip -d result
     - run: ls result
-    - name: Extract PR number
-      id: extract-pr-number
+    - name: Extract PR data
+      id: extract-pr-data
       run: |
         cd result
-        awk -v ok=1 \
-          '{ print; if(!match($0, /^[1-9][0-9]*$/)) ok=0; } END { exit !(NR==1 && ok); }' \
-          pr-number.txt
-        echo "number=$(cat pr-number.txt)" >> $GITHUB_OUTPUT
-        rm pr-number.txt
+        awk -v ok=1 '
+          NR == 1 && match($0, /^[1-9][0-9]* [0-9a-fA-F]{7,}$/) {
+            print "number=" $1;
+            print "commit=" $2;
+            next;
+          }
+          { ok = 0; }
+          END { exit !ok; }
+        ' pr-data.txt >> $GITHUB_OUTPUT
+        rm pr-data.txt
     - name: Insert preview warning
       env:
-        PR: ${{ steps.extract-pr-number.outputs.number }}
+        PR: ${{ steps.extract-pr-data.outputs.number }}
+        COMMIT: ${{ steps.extract-pr-data.outputs.commit }}
       run: |
         tmp="$(mktemp -u XXXXXXXX.json)"
         repo_url="https://github.com/$GITHUB_REPOSITORY"
-        commit="$(git rev-parse --verify HEAD)"
-        jq -n --arg repo_url "$repo_url" --arg PR "$PR" --arg commit "$commit" '
+        jq -n --arg repo_url "$repo_url" --arg PR "$PR" --arg commit "$COMMIT" '
           def repo_link($args): $args as [$path, $contents]
             | ($repo_url + ($path // "")) as $url
             | "<a href=\"\($url | @html)\">\($contents // $url)</a>";
@@ -91,7 +96,7 @@ jobs:
       with:
         branch: gh-pages
         folder: result
-        target-folder: pr/${{ steps.extract-pr-number.outputs.number }}
+        target-folder: pr/${{ steps.extract-pr-data.outputs.number }}
     - name: Determine gh-pages url
       id: get-pages-url
       run: |
@@ -102,7 +107,7 @@ jobs:
       uses: phulsechinmay/rewritable-pr-comment@v0.3.0
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        ISSUE_ID: ${{ steps.extract-pr-number.outputs.number }}
+        ISSUE_ID: ${{ steps.extract-pr-data.outputs.number }}
         message: >
           The rendered spec for this PR is available at
-          ${{ steps.get-pages-url.outputs.url }}/pr/${{ steps.extract-pr-number.outputs.number }}.
+          ${{ steps.get-pages-url.outputs.url }}/pr/${{ steps.extract-pr-data.outputs.number }}.
diff --git a/.github/workflows/render-pr.yml b/.github/workflows/render-pr.yml
index 503f66a..9cc0f2c 100644
--- a/.github/workflows/render-pr.yml
+++ b/.github/workflows/render-pr.yml
@@ -13,8 +13,10 @@ jobs:
       with:
         node-version: lts/*
     - run: npm run build
-    - name: Save PR number
-      run: echo ${{ github.event.number }} > build/pr-number.txt
+    - name: Save PR data
+      env:
+        PR: ${{ github.event.number }}
+      run: echo "$PR $(git rev-parse --verify HEAD)" > build/pr-data.txt
     - uses: actions/upload-artifact@v4
       id: upload
       if: ${{ !github.event.repository.fork }}