From aebde0b8f00971dde249ee847653c62fff284a4c Mon Sep 17 00:00:00 2001
From: "ncmake-updater[bot]"
 <307247918+ncmake-updater[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2026 08:49:55 +0000
Subject: [PATCH] ci: update managed CI workflows from upstream

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/.ncmake-workflows.json |  4 +--
 .github/workflows/workflow-updater.yml   | 39 +++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/.ncmake-workflows.json b/.github/workflows/.ncmake-workflows.json
index dd95899..a24615a 100644
--- a/.github/workflows/.ncmake-workflows.json
+++ b/.github/workflows/.ncmake-workflows.json
@@ -35,8 +35,8 @@
     "source": "nextcloud"
   },
   "workflow-updater.yml": {
-    "hash": "336f88603161615da3dcadaa3c02185b816ebcbb87fa9c5fb532fad42e8d60cf",
-    "sha": "1407e592f85bbd1299cc5ff5e2db1eec861d0182",
+    "hash": "8461d0138be309fe7efb500b7ecf044be88f9138199241f41a7d4ecad37dced0",
+    "sha": "1adddbae13390821da9dd50c8fbedcb16290da18",
     "source": "ncmake"
   }
 }
diff --git a/.github/workflows/workflow-updater.yml b/.github/workflows/workflow-updater.yml
index 1407e59..1adddba 100644
--- a/.github/workflows/workflow-updater.yml
+++ b/.github/workflows/workflow-updater.yml
@@ -4,7 +4,8 @@
 # ncmake workflow updater: on a schedule, refreshes the ncmake-managed CI
 # workflows from their upstream templates (make workflows-update) and opens a
 # pull request when anything changed. This replaces Dependabot for the files
-# under .github/workflows/.
+# under .github/workflows/. Once that pull request is merged it deletes its own
+# branch, so no stale ncmake/ci/workflow-update branch is left behind.
 #
 # Authentication is a GitHub App (Contents, Pull requests and Workflows: write),
 # minted per run as a short-lived token. The app is required because the default
@@ -24,6 +25,11 @@ on:
     # waiting for the schedule.
     - cron: '30 5 * * *'
   workflow_dispatch:
+  # React to a merge so the cleanup job can remove the updater's own branch.
+  # This fires for every closed pull request in the repository; the cleanup job
+  # filters down to a merged ncmake/ci/workflow-update.
+  pull_request:
+    types: [closed]
 
 permissions:
   contents: read
@@ -34,6 +40,9 @@ concurrency:
 
 jobs:
   update:
+    # The scheduled/manual side: refresh the workflows and open the pull request.
+    # Skipped for the pull_request trigger, which only drives the cleanup job.
+    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - name: Create app token
@@ -70,3 +79,31 @@ jobs:
             `make workflows-update` refreshed the ncmake-managed workflows from
             their upstream templates (nextcloud/.github + ncmake). Locally
             modified workflows are left untouched. Review the diff and merge.
+
+  cleanup:
+    # Delete the updater's own branch as soon as its pull request is merged,
+    # instead of leaving it until the next scheduled run removes it (which is
+    # what create-pull-request's delete-branch does). It uses the same GitHub
+    # App as the update job, so it always has Contents: write regardless of the
+    # repository's default token permissions. This only ever touches
+    # ncmake/ci/workflow-update, and is unrelated to the repository-wide
+    # "Automatically delete head branches" setting (see doc/DELETE_MERGED_BRANCHES.md).
+    if: >-
+      github.event_name == 'pull_request'
+      && github.event.pull_request.merged == true
+      && github.event.pull_request.head.ref == 'ncmake/ci/workflow-update'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create app token
+        id: app-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ secrets.NCMAKE_UPDATER_CLIENT_ID }}
+          private-key: ${{ secrets.NCMAKE_UPDATER_PRIVATE_KEY }}
+
+      - name: Delete the merged updater branch
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          gh api --method DELETE \
+            "repos/${{ github.repository }}/git/refs/heads/ncmake/ci/workflow-update"