From c96c7cb8d235743ad05bbcf20d969c6bd254f078 Mon Sep 17 00:00:00 2001
From: Digikwal <79085106+digikwal@users.noreply.github.com>
Date: Wed, 30 Jul 2025 11:34:33 +0200
Subject: [PATCH] fieldmate(release): Trigger rebuild from new fieldmate
 release (#10)

---
 .apps_versions/fieldmate.version           |  2 +-
 .github/workflows/auto-merge-fieldmate.yml | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.apps_versions/fieldmate.version b/.apps_versions/fieldmate.version
index 5a8fcffe..669cbd1e 100644
--- a/.apps_versions/fieldmate.version
+++ b/.apps_versions/fieldmate.version
@@ -1 +1 @@
-1751206484
+1753865654
diff --git a/.github/workflows/auto-merge-fieldmate.yml b/.github/workflows/auto-merge-fieldmate.yml
index 36e6867d..ed7e0367 100644
--- a/.github/workflows/auto-merge-fieldmate.yml
+++ b/.github/workflows/auto-merge-fieldmate.yml
@@ -18,22 +18,20 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Enable auto-merge or fallback merge
+      - name: Enable GitHub auto-merge
         env:
           GH_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
+          COMMIT_TITLE: "Auto-merge fieldmate release"
+          COMMIT_BODY: "Triggered by fieldmate release workflow"
         run: |
-          echo "Trying to enable auto-merge for PR #$PR_NUMBER"
-          # Try auto-merge first
+          echo "ℹ️ Attempting GitHub auto-merge for PR #$PR_NUMBER"
+
           gh pr merge "$PR_NUMBER" \
             --squash \
             --auto \
             --delete-branch \
             --body "$COMMIT_BODY" \
-            --subject "$COMMIT_TITLE" || \
-          # Fallback: direct squash merge
-          gh pr merge "$PR_NUMBER" \
-            --squash \
-            --delete-branch \
-            --body "$COMMIT_BODY" \
             --subject "$COMMIT_TITLE"
+
+          echo "✅ Auto-merge enabled"