add github action step to merge 'app' into 'main' on successful job c…

…ompletion

.github/workflows/docker.yaml

@@ -46,3 +46,15 @@ jobs:
       - name: Push Docker image
         run: |
           docker push ${{ secrets.DOCKER_USER }}/gitops-app:${{ steps.get_version.outputs.version }}
+
+      # Step 8: Merge app branch into main if build succeeds
+      - name: Merge app branch into main
+        if: success() # Only run this step if all previous steps succeeded
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Actions"
+          git checkout main
+          git merge --no-ff app
+          git push origin main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}