From e21a2730e7a481e9f40d105fb894cadb85a0a6ef Mon Sep 17 00:00:00 2001
From: Bruno Mendes <bd_mendes@outlook.com>
Date: Fri, 1 Sep 2023 15:11:28 +0100
Subject: [PATCH] Fix force push to develop on master hotfixes

---
 .github/workflows/deploy.yaml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index cbd989070..f32f1a4a2 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,9 +1,11 @@
 on:
   push:
-    branches: [ master, develop ]
+    branches: [master, develop]
 
 jobs:
   bump_version:
+    permissions:
+      actions: "write"
     name: "Bump pubspec version"
     runs-on: ubuntu-latest
     env:
@@ -35,9 +37,17 @@ jobs:
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: "Bump app version [no ci]"
-      - name: Propagate master version bump to develop
+
+      - name: Propagate master version bump to develop if master version is aad
         if: github.ref == 'refs/heads/master'
-        run: git push --force-with-lease origin HEAD:develop
+        run: |
+          git fetch origin develop
+          if [[ $(git diff --quiet HEAD~1 origin/develop) ]]; then
+            echo "Master version does not match develop version"
+          else
+            echo "Master version matches develop version"
+            git push --force-with-lease origin HEAD:develop
+          fi
 
   build:
     name: "Build App Bundle"
@@ -55,7 +65,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: ${{env.JAVA_VERSION}}
-          distribution: 'zulu'
+          distribution: "zulu"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}