From 20bb43057e6615d8e1b1c9f8991c662fefc4db13 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <62671086+barrettruth@users.noreply.github.com>
Date: Tue, 3 Mar 2026 15:06:08 -0500
Subject: [PATCH] ci(digest): use fixed branch with force-push for weekly
 digest (#44)

Problem: the workflow creates a new dated branch each run. If a digest
PR is not merged before the next run, duplicate PRs accumulate.

Solution: use a single canonical branch ci/upstream-digest with
--force push. Each run resets to main, applies any new items, and
force-pushes. If a PR is already open for the branch, GitHub updates
it in place. A new PR is only created (with auto-merge) when none
exists. The close-stale step is no longer needed.
---
 .github/workflows/upstream-digest.yml | 38 +++++++++------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/upstream-digest.yml b/.github/workflows/upstream-digest.yml
index 533b0b3..f3482cc 100644
--- a/.github/workflows/upstream-digest.yml
+++ b/.github/workflows/upstream-digest.yml
@@ -15,20 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Close existing digest PRs
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr list \
-            --repo barrettruth/canola.nvim \
-            --label "upstream/digest" \
-            --state open \
-            --json number \
-            --jq '.[].number' \
-          | xargs -r -I{} gh pr close {} \
-              --repo barrettruth/canola.nvim \
-              --delete-branch
-
       - name: Update upstream tracker
         id: digest
         env:
@@ -39,23 +25,23 @@ jobs:
         if: steps.digest.outputs.changed == 'true'
         run: npx --yes prettier --write doc/upstream.md
 
-      - name: Create PR
+      - name: Push and open PR if needed
         if: steps.digest.outputs.changed == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          DATE=$(date +%Y-%m-%d)
-          BRANCH="ci/upstream-digest-${DATE}"
+          BRANCH="ci/upstream-digest"
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git checkout -b "${BRANCH}"
           git add doc/upstream.md
-          git commit -m "docs(upstream): add digest for week of ${DATE}"
-          git push origin "${BRANCH}"
-          PR_URL=$(gh pr create \
-            --title "docs(upstream): add digest for week of ${DATE}" \
-            --body "Automated weekly digest of new upstream activity. Triage by updating statuses and notes." \
-            --base main \
-            --head "${BRANCH}" \
-            --label "upstream/digest")
-          gh pr merge "${PR_URL}" --auto --squash
+          git commit -m "docs(upstream): upstream digest $(date +%Y-%m-%d)"
+          git push --force origin "${BRANCH}"
+          if ! gh pr list --head "${BRANCH}" --state open --json number --jq '.[0].number' | grep -q .; then
+            PR_URL=$(gh pr create \
+              --title "docs(upstream): upstream digest" \
+              --body "Automated weekly digest of new upstream activity. Triage by updating statuses and notes." \
+              --base main \
+              --head "${BRANCH}")
+            gh pr merge "${PR_URL}" --auto --squash
+          fi