Merge remote-tracking branch 'origin/develop'

.github/workflows/ci-cd.yml

@@ -83,4 +83,26 @@ jobs:
           git fetch origin
           git checkout main
           git merge --no-ff origin/develop
-          git push origin main
+          git push origin main
+
+  sync-develop:
+    needs: merge-to-main
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Git authentication
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
+          git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
+
+      - name: Sync Develop with Main
+        run: |
+          git fetch origin
+          git checkout develop
+          git merge --no-ff origin/main
+          git push origin develop

.github/workflows/deploy.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - main
+  workflow_run:
+    workflows: ["CI/CD Pipeline"]
+    types:
+      - completed
 
 jobs:
   deploy:

.github/workflows/docker-build.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - main
+  workflow_run:
+    workflows: ["CI/CD Pipeline"]
+    types:
+      - completed
 
 jobs:
   build-and-push: