From 17df1b6eb9787804a9980280edfaae5ab6a5da2a Mon Sep 17 00:00:00 2001
From: Lasse Nielsen <lasse@xerrion.dk>
Date: Sat, 21 Feb 2026 14:48:18 +0100
Subject: [PATCH 1/3] ci: combine release-please and packager into single
 workflow

---
 .github/workflows/release-please.yml | 16 ----------------
 .github/workflows/release.yml        | 24 +++++++++++++++++++-----
 2 files changed, 19 insertions(+), 21 deletions(-)
 delete mode 100644 .github/workflows/release-please.yml

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
deleted file mode 100644
index a2f7401..0000000
--- a/.github/workflows/release-please.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Release Please
-
-on:
-  push:
-    branches:
-      - master
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: googleapis/release-please-action@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46788ab..aa94978 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,24 +1,38 @@
-name: Package and Release
+name: Release
 
 on:
   push:
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
+    branches:
+      - master
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
-  release:
+  release-please:
     runs-on: ubuntu-latest
+    outputs:
+      release_created: ${{ steps.release.outputs.release_created }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
+    steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
 
+  package:
+    needs: release-please
+    if: ${{ needs.release-please.outputs.release_created == 'true' }}
+    runs-on: ubuntu-latest
     env:
       CF_API_KEY: ${{ secrets.CF_API_KEY }}
       WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
       WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
       GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-
     steps:
       - name: Clone project
         uses: actions/checkout@v4
         with:
+          ref: ${{ needs.release-please.outputs.tag_name }}
           fetch-depth: 0
 
       - name: Package and release

From bf9cd6721648dcc3629997e47119ab3055b00777 Mon Sep 17 00:00:00 2001
From: Lasse Nielsen <lasse@xerrion.dk>
Date: Sat, 21 Feb 2026 14:48:28 +0100
Subject: [PATCH 2/3] docs: update AGENTS.md for combined workflow

---
 AGENTS.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 62530d8..913886e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -36,8 +36,7 @@ RaidLogAuto/
 ├── .pkgmeta                     # Packaging metadata
 ├── .github/workflows/
 │   ├── lint.yml                # Luacheck CI on PRs and master
-│   ├── release.yml             # Auto-packaging on tag push
-│   └── release-please.yml     # Automated versioning and changelog
+│   └── release.yml             # Release-please + auto-packaging
 ```
 
 ### Version-Specific Files

From b08b66f5ea7b1bbb652967788ac03c1a5cd251fb Mon Sep 17 00:00:00 2001
From: Lasse Nielsen <lasse@xerrion.dk>
Date: Sat, 21 Feb 2026 15:02:54 +0100
Subject: [PATCH 3/3] ci: add workflow_dispatch trigger for manual packaging

---
 .github/workflows/release.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aa94978..07a0d74 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,12 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag to package (e.g. 1.1.2)'
+        required: true
+        type: string
 
 permissions:
   contents: write
@@ -11,6 +17,7 @@ permissions:
 
 jobs:
   release-please:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     outputs:
       release_created: ${{ steps.release.outputs.release_created }}
@@ -21,7 +28,7 @@ jobs:
 
   package:
     needs: release-please
-    if: ${{ needs.release-please.outputs.release_created == 'true' }}
+    if: ${{ always() && (needs.release-please.outputs.release_created == 'true' || github.event_name == 'workflow_dispatch') }}
     runs-on: ubuntu-latest
     env:
       CF_API_KEY: ${{ secrets.CF_API_KEY }}
@@ -32,7 +39,7 @@ jobs:
       - name: Clone project
         uses: actions/checkout@v4
         with:
-          ref: ${{ needs.release-please.outputs.tag_name }}
+          ref: ${{ needs.release-please.outputs.tag_name || github.event.inputs.tag_name }}
           fetch-depth: 0
 
       - name: Package and release