Merge branch 'dev' into amitpjoshiem-patch-1

Author: amitpjoshiem

.github/workflows/sync-dev-to-stage.yml

@@ -13,14 +13,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Create auto-merge Label (if missing)
-        uses: actions-ecosystem/action-create-label@v1
-        with:
-          github_token: ${{ secrets.PERSONAL_TOKEN }}
-          label: auto-merge
-          color: '#0e8a16'
-          description: 'Auto-merge PRs with this label'
-
       - name: Sync Branches (Create PR)
         uses: tretuna/sync-branches@1.4.0
         with:
@@ -31,16 +23,30 @@ jobs:
           PULL_REQUEST_BODY: "Automated PR to sync dev to stage."
           PULL_REQUEST_LABELS: "auto-merge"
 
-  auto-merge:
+  sync-dev-to-stage:
     runs-on: ubuntu-latest
-    needs: sync-branches
-
     steps:
-      - name: Auto-Merge PR
-        uses: peter-evans/merge-pull-request@v3
+      - name: Checkout Repository
+        uses: actions/checkout@v3
         with:
-          token: ${{ secrets.PERSONAL_TOKEN }}
-          merge-method: squash # Change to merge, squash, or rebase
-          labels: auto-merge
-          commit-title: "Auto-merged dev into stage"
-          commit-message: "Automatically merged PR from dev to stage."
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: Set up Git identity
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+
+      - name: Fetch latest changes from origin
+        run: |
+          git fetch origin --prune
+
+      - name: Checkout stage branch and merge dev into it
+        run: |
+          git checkout stage || git checkout -b stage
+          git pull origin stage --ff-only || true
+          git merge --no-ff dev || true
+
+      - name: Push changes to origin/stage branch
+        run: |
+          git push origin stage --force-with-lease || echo "No changes to push"

pull_request_template.md

@@ -14,7 +14,7 @@
 - [ ] Have you lint your code locally before submission?
 - [ ] The commit message follows our guidelines
 - [ ] Tests for the changes have been added (for bug fixes, features, docs update etc)
-- [ ] Approved by at least two developer: @amitpjoshiem, @ShubhamEngMind, @shreyashG13
+- [ ] Approved by at least two developer: @amitpjoshiem.
 - [ ] Ensure there aren't other open [Pull Requests](https://github.com/Engineersmind/Revi-backend/pulls) for the same update/change?
 
 ## Type of Change