From 1bd5427bbbe1ca5ffe1836228a8fef1989395f47 Mon Sep 17 00:00:00 2001
From: Trung-Tin Pham <60747384+AtelyPham@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:18:58 +0700
Subject: [PATCH] [RELEASE] Fix tangle-dapp v0.0.14 release

---
 .../workflows/auto-sync-master-with-develop.yml   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/auto-sync-master-with-develop.yml b/.github/workflows/auto-sync-master-with-develop.yml
index 580d4c3c39..31d91035d0 100644
--- a/.github/workflows/auto-sync-master-with-develop.yml
+++ b/.github/workflows/auto-sync-master-with-develop.yml
@@ -21,10 +21,10 @@ jobs:
           app-id: ${{ vars.AUTO_SYNC_BRANCHES_APP_ID }}
           private-key: ${{ secrets.AUTO_SYNC_BRANCHES_SECRET }}
 
-      - name: Checkout Develop
+      - name: Checkout Master
         uses: actions/checkout@v4
         with:
-          ref: develop
+          ref: master
           fetch-depth: 0
           token: ${{ steps.app-token.outputs.token }}
 
@@ -33,15 +33,12 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Checkout Master and Fast-Forward Merge
+      - name: Merge Release Commit to Master
         run: |
-          git checkout develop
-          git fetch origin
-          git checkout master
-          git pull
-          git merge --ff-only origin/develop
+          git fetch origin develop
+          git merge --ff-only ${{ github.sha }}
 
       - name: Push Changes to Master
-        run: git push origin master --force-with-lease
+        run: git push origin master
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}