Merge remote-tracking branch 'origin/Develop' into Develop

Author: RNViththagan

.github/workflows/auto-merge.yml

@@ -3,26 +3,30 @@ name: Auto Merge Develop to Main
 on:
   push:
     branches:
-      - Develop  # Trigger action on push to Develop
+      - Develop
 
 jobs:
   merge:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Get last commit message on Develop
         id: last_commit
         run: |
           LAST_COMMIT_MSG=$(git log -1 --pretty=%B)
-          echo "Last commit message: $LAST_COMMIT_MSG"
-          echo "::set-output name=commit_message::$LAST_COMMIT_MSG"
+          echo "commit_message=$LAST_COMMIT_MSG" >> $GITHUB_ENV
 
-      - name: Set up Git
+      - name: Set up Git with Your Credentials
         run: |
-          git config user.name "github-actions"
-          git config user.email "github-actions@github.com"
+          git config user.name "RNViththagan"
+          git config user.email "viththagan1999@gmail.com" 
 
       - name: Checkout main branch
         run: |
@@ -31,16 +35,23 @@ jobs:
 
       - name: Merge Develop into main (if commit message matches)
         run: |
-          # Convert commit message to lowercase for case-insensitive comparison
-          COMMIT_MSG_LOWER=$(echo "${{ steps.last_commit.outputs.commit_message }}" | tr '[:upper:]' '[:lower:]')
-          
+          COMMIT_MSG_LOWER=$(echo "$commit_message" | tr '[:upper:]' '[:lower:]')
+
           if [[ "$COMMIT_MSG_LOWER" == *"ready to deploy"* ]]; then
-            echo "Commit message matches, merging Develop into main."
-            git merge origin/Develop --no-ff --allow-unrelated-histories -m "Merge Develop into main"
-            # Attempt the merge and capture the result
-            git merge origin/Develop --no-ff -m "Merge Develop into main" || { echo "Merge conflicts detected, skipping push."; exit 1; }
-            
-            git push origin main
+            echo "Commit message matches, attempting merge."
+            if git merge origin/Develop --no-ff -m "Merge Develop into main"; then
+              echo "Merge successful."
+            else
+              echo "Merge conflicts detected. Aborting."
+              git merge --abort
+              exit 1
+            fi
           else
             echo "Commit message does not match, skipping merge."
           fi
+
+      - name: Push changes to main
+        run: |
+          git push origin main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}