From e431f205c2da302d9f88ab4925e2245a5ee05cf9 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 29 Dec 2025 19:05:26 +0100
Subject: [PATCH] refactor: move publish.yml workflow into release please
 workflow (#29)

---
 .github/workflows/publish.yml        | 58 ----------------------------
 .github/workflows/release-please.yml | 55 ++++++++++++++++++++++++++
 release-please-config.json           |  3 +-
 3 files changed, 57 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index b560c0c..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  release:
-    name: Publish App
-    runs-on: ${{ matrix.os }}
-
-    permissions:
-      contents: write
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Checkout assets
-        run: git -c submodule."assets".update=checkout submodule update --init assets
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          run_install: false
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Publish
-        run: |
-          pnpm run publish
-        env:
-          PLATFORM: ${{ matrix.os }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish macOS x64
-        if: matrix.os == 'macos-latest'
-        run: pnpm run publish --arch=x64
-        env:
-          PLATFORM: ${{ matrix.os }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish Linux arm64
-        if: matrix.os == 'ubuntu-latest'
-        run: pnpm run publish --arch=arm64
-        env:
-          PLATFORM: ${{ matrix.os }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 06df914..c863b0f 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -31,3 +31,58 @@ jobs:
         with:
           token: ${{ steps.app-token.outputs.token }}
           config-file: release-please-config.json
+
+  publish-release:
+    name: Publish App
+    needs: release-please
+    if: needs.release-please.outputs.release_created == 'true'
+    runs-on: ${{ matrix.os }}
+
+    permissions:
+      contents: write
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Checkout assets
+        run: git -c submodule."assets".update=checkout submodule update --init assets
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Publish
+        run: |
+          pnpm run publish
+        env:
+          PLATFORM: ${{ matrix.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish macOS x64
+        if: matrix.os == 'macos-latest'
+        run: pnpm run publish --arch=x64
+        env:
+          PLATFORM: ${{ matrix.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish Linux arm64
+        if: matrix.os == 'ubuntu-latest'
+        run: pnpm run publish --arch=arm64
+        env:
+          PLATFORM: ${{ matrix.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/release-please-config.json b/release-please-config.json
index 161d1ad..716a3a9 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -6,7 +6,8 @@
       "bump-minor-pre-major": false,
       "bump-patch-for-minor-pre-major": false,
       "draft": false,
-      "prerelease": false
+      "prerelease": false,
+      "include-component-in-tag": false
     }
   },
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"