From 62fc3d71f90649ea2f1a33108a3416901a83d3dd Mon Sep 17 00:00:00 2001
From: Vince Jerald Villamora <vincevillamora@gmail.com>
Date: Fri, 21 Oct 2022 19:16:24 +0800
Subject: [PATCH] fix(github-actions): add branch resync during push in main

---
 .github/workflows/release-main.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
index 30a298e..5a52d95 100644
--- a/.github/workflows/release-main.yml
+++ b/.github/workflows/release-main.yml
@@ -43,6 +43,19 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
+  rebase_dev:
+    name: Sync development branch
+    runs-on: ubuntu-latest
+    needs: versioning
+    steps:
+      - uses: actions/checkout@v3
+      - name: ReSync Branch
+        uses: Joao208/resync-branch@1.5.1
+        with:
+          PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH_NAME: development
+          DEFAULT_BRANCH: ${{github.event.repository.default_branch}}
+
   code_quality_checks:
     name: Code quality checks
     runs-on: ubuntu-latest
@@ -96,7 +109,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: main
+          ref: ${{ github.event.repository.default_branch }}
           fetch-depth: 0
 
       - name: Set up JDK 17