From 315b051b9dac40f315ead0b353d670925838c2ed Mon Sep 17 00:00:00 2001
From: ManuelStaggl <17688572+ManuelStaggl@users.noreply.github.com>
Date: Thu, 12 Nov 2026 19:54:38 +0100
Subject: [PATCH] ci: a new release gets the macOS dmg attached by the
 installer workflow

The release workflow calls installer.yml for the new tag; its new job uploads
the dmg to the release. Started by hand, the workflow attaches only when asked.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
---
 .github/workflows/installer.yml      | 35 +++++++++++++++++++++++++++-
 .github/workflows/release-please.yml | 14 +++++++++++
 CONTRIBUTING.md                      |  5 +++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
index 1199a84c..a55f655b 100644
--- a/.github/workflows/installer.yml
+++ b/.github/workflows/installer.yml
@@ -1,7 +1,8 @@
 name: Installer
 
 # Builds the Windows installer and the macOS dmg from a tag or branch on GitHub-hosted runners and
-# keeps them as workflow artifacts. Started by hand for now; it publishes nothing. Code signing through the
+# keeps them as workflow artifacts. Started by hand it publishes nothing unless "attach" is set; the
+# release workflow calls it to hang the dmg onto a new release. Code signing through the
 # SignPath Foundation needs exactly this: every job up to the signing request on GitHub-hosted
 # runners, and the unsigned file stored as a workflow artifact first (docs/code-signing-policy.md).
 # The self-hosted runners of ADR 0022 are therefore not used here.
@@ -13,6 +14,18 @@ on:
         description: Tag or branch to build
         type: string
         default: main
+      attach:
+        description: Attach the dmg to the release of this tag
+        type: boolean
+        default: false
+  workflow_call:
+    inputs:
+      ref:
+        type: string
+        required: true
+      attach:
+        type: boolean
+        default: false
 
 permissions:
   contents: read
@@ -121,3 +134,23 @@ jobs:
           fi
           kill "$pid"
           tail -n 40 start.log
+
+  # The Windows installer is still built and uploaded on Windows by hand (CONTRIBUTING.md); only
+  # the dmg, which nobody can build locally, goes onto the release from here.
+  attach:
+    name: Attach the dmg to the release
+    needs: macos
+    if: inputs.attach
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
+    permissions:
+      actions: read
+      contents: write
+    steps:
+      - name: Upload the dmg to the release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REF: ${{ inputs.ref }}
+        run: |
+          gh run download "$GITHUB_RUN_ID" --name partbuddy-dmg-macos --repo "$GITHUB_REPOSITORY"
+          gh release upload "$REF" PartBuddy-*-mac-universal.dmg --clobber --repo "$GITHUB_REPOSITORY"
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 848f850d..726a0324 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -45,3 +45,17 @@ jobs:
       tag: ${{ needs.release-please.outputs.tag_name }}
     secrets:
       SITE_REPO_TOKEN: ${{ secrets.SITE_REPO_TOKEN }}
+
+  # The macOS dmg cannot be built on the Windows machine that uploads the installer by hand, so the
+  # installer workflow builds it for the new tag and attaches it to the release.
+  dmg:
+    name: Attach the macOS dmg
+    needs: release-please
+    if: needs.release-please.outputs.release_created == 'true'
+    permissions:
+      actions: read
+      contents: write
+    uses: ./.github/workflows/installer.yml # zizmor: ignore[self-repository]
+    with:
+      ref: ${{ needs.release-please.outputs.tag_name }}
+      attach: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7632646e..1a621436 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -86,7 +86,10 @@ looks for updates in the GitHub releases (electron-updater) and installs them on
 word. The CI runners are Linux, so a release is built on Windows: after release-please's release
 exists, run `dist` and upload the installer, its `.blockmap` and `latest.yml` to that release
 (`gh release upload v<version> apps/desktop/dist/PartBuddy-Setup-<version>.exe
-apps/desktop/dist/PartBuddy-Setup-<version>.exe.blockmap apps/desktop/dist/latest.yml`).
+apps/desktop/dist/PartBuddy-Setup-<version>.exe.blockmap apps/desktop/dist/latest.yml`). The macOS
+dmg needs no hand: the release workflow calls `installer.yml` for the new tag, which builds the dmg
+and attaches it to the release. If that job found no runner, rerun it, or start `installer.yml` by
+hand with the tag and "attach".
 
 ## Licence of contributions