Just apply docs/ changes from that single commit - refs #1

Author: simonw

.github/workflows/stable-docs.yml

@@ -41,9 +41,10 @@ jobs:
     - name: Handle Commit to Main
       if: contains(github.event.head_commit.message, '!stable-docs')
       run: |
-        # Apply all changes that affect docs/ directory
-        for commit in $(git log --format="%H" origin/main ^origin/stable-docs); do
-          git show $commit -- docs/ | git apply -
-          git add docs/
-          git commit -m "Cherry-picked docs changes from $commit" || true
-        done
+        git fetch origin stable-docs:stable-docs
+        git checkout stable-docs
+        # !stable-docs should only be in the one commit, so apply changes from that commit
+        git show ${{ github.sha }} -- docs/ | git apply -
+        git add docs/
+        git commit -m "Cherry-picked docs changes from ${{ github.sha }}" || true
+        git push origin stable-docs