From 010dd2a918ff61f70d8c37547d2911a60cf40dfa Mon Sep 17 00:00:00 2001
From: Gabriel Saratura <gabriel.saratura@vshn.net>
Date: Wed, 6 Aug 2025 11:30:14 +0200
Subject: [PATCH 1/2] Trigger release after merge

---
 .github/workflows/merge.yml   | 15 +++++++++++++++
 .github/workflows/release.yml |  6 ++++++
 2 files changed, 21 insertions(+)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 999468187d..f985c0ba5a 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -260,6 +260,21 @@ jobs:
           echo "✅ Created and pushed tag: $NEW_TAG"
           echo "appcat-tag=$NEW_TAG" >> $GITHUB_OUTPUT
 
+      - name: Trigger Release Workflow
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'release.yml',
+              ref: 'master',
+              inputs: {
+                tag: '${{ steps.tag.outputs.appcat-tag }}'
+              }
+            });
+
       - name: Clone and patch component repo
         run: |
           COMPONENT_BRANCH="${{ needs.check-conditions.outputs.comp-feature-branch }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b671c253d1..462021983f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,12 @@ on:
   push:
     tags:
       - "*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to release'
+        required: true
+        type: string
 
 env:
   APP_NAME: appcat

From 5c68a237b76e118d704a374bebd004afac0ea7f8 Mon Sep 17 00:00:00 2001
From: Gabriel Saratura <gabriel.saratura@vshn.net>
Date: Wed, 6 Aug 2025 14:08:36 +0200
Subject: [PATCH 2/2] Fix author in workflow

---
 .github/workflows/merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index f985c0ba5a..3533bdad78 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -326,7 +326,7 @@ jobs:
           gh pr merge -R "$COMPONENT_REPO" ${{ needs.check-conditions.outputs.comp-pr-number }} --merge --delete-branch
 
   merge-hotfix-update-develop:
-    needs: merge-hotfix
+    needs: [merge-hotfix, check-conditions]
     runs-on: ubuntu-latest
     steps:
       - name: Create PR to merge master into develop in appcat repo
@@ -337,7 +337,7 @@ jobs:
             --repo "$APPCAT_REPO" \
             --base develop \
             --head master \
-            --reviewer ${{ needs.check-conditions.outputs.author }} \ \
+            --reviewer ${{ needs.check-conditions.outputs.author }} \
             --title "🔀 Merge master into develop (sync hotfixes)" \
             --body "This PR synchronizes the hotfixes from master back into develop." || true