VYP: Edited workflow sync file

Author: ICICLE Edge Admin

.github/workflows/service-sync.yaml

@@ -1,70 +1,149 @@
-name: Sync Service Folder to Main
+name: Sync Service to Main
 
 on:
   push:
     branches:
-      - services/**
+      - 'services/**'  # Triggers on any branch starting with services/
 
 jobs:
   sync-to-main:
+    # Only run if we're not already on main branch
+    if: github.ref_name != 'main'
     runs-on: ubuntu-latest
-
+    
     steps:
-      - name: Checkout source branch
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Configure Git
+      run: |
+        git config --global user.name 'github-actions[bot]'
+        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+    - name: Extract current service info
+      id: service-info
+      run: |
+        CURRENT_BRANCH="${{ github.ref_name }}"
+        SERVICE_PATH="$CURRENT_BRANCH"
+        SERVICE_NAME=$(basename "$CURRENT_BRANCH")
+        
+        echo "current_branch=$CURRENT_BRANCH" >> $GITHUB_OUTPUT
+        echo "service_path=$SERVICE_PATH" >> $GITHUB_OUTPUT
+        echo "service_name=$SERVICE_NAME" >> $GITHUB_OUTPUT
+        
+        echo "🔍 Detected service: $SERVICE_NAME"
+        echo "🌿 Current branch: $CURRENT_BRANCH"
+        echo "📁 Target path in main: $SERVICE_PATH"
+
+    - name: Fetch main branch
+      run: |
+        git fetch origin main:main
+
+    - name: Create backup of current changes
+      run: |
+        # Stash any uncommitted changes (just in case)
+        git stash push -m "backup-before-sync" || true
 
-      - name: Extract service name from branch
-        id: extract
-        run: |
-          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
-          SERVICE_NAME="${BRANCH_NAME#services/}"
-          echo "SERVICE_NAME=$SERVICE_NAME" >> $GITHUB_ENV
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
+    - name: Switch to main and sync service
+      run: |
+        SERVICE_PATH="${{ steps.service-info.outputs.service_path }}"
+        CURRENT_BRANCH="${{ steps.service-info.outputs.current_branch }}"
+        SERVICE_NAME="${{ steps.service-info.outputs.service_name }}"
+        
+        echo "🔄 Syncing $SERVICE_NAME to main branch..."
+        
+        # Switch to main branch
+        git checkout main
+        git pull origin main
+        
+        # Ensure the service directory exists in main
+        mkdir -p "$SERVICE_PATH"
+        
+        # Copy the entire service from the current branch to main
+        git checkout "$CURRENT_BRANCH" -- "$SERVICE_PATH/" 2>/dev/null || {
+          echo "⚠️ Service path $SERVICE_PATH not found in current branch, syncing entire branch content to service path"
+          # If the service path doesn't exist in current branch, copy all files to the service path
+          git checkout "$CURRENT_BRANCH" -- .
+          mkdir -p "$SERVICE_PATH"
+          # Move all files except .git to the service path
+          find . -maxdepth 1 ! -name '.' ! -name '..' ! -name '.git' ! -name "$SERVICE_PATH" -exec mv {} "$SERVICE_PATH/" \; 2>/dev/null || true
+        }
 
-      - name: Checkout main branch
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          path: main_branch
+    - name: Check for changes and commit
+      id: commit-changes
+      run: |
+        SERVICE_PATH="${{ steps.service-info.outputs.service_path }}"
+        CURRENT_BRANCH="${{ steps.service-info.outputs.current_branch }}"
+        SERVICE_NAME="${{ steps.service-info.outputs.service_name }}"
+        
+        # Stage all changes in the service path
+        git add "$SERVICE_PATH/"
+        
+        # Check if there are staged changes
+        if git diff --staged --quiet; then
+          echo "has_changes=false" >> $GITHUB_OUTPUT
+          echo "ℹ️ No changes detected for $SERVICE_NAME"
+        else
+          echo "has_changes=true" >> $GITHUB_OUTPUT
+          
+          # Get the latest commit info from the service branch
+          COMMIT_MESSAGE=$(git log -1 --pretty=format:"%s" "$CURRENT_BRANCH")
+          COMMIT_HASH=$(git log -1 --pretty=format:"%h" "$CURRENT_BRANCH")
+          COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an" "$CURRENT_BRANCH")
+          
+          # Create a descriptive commit message
+          SYNC_MESSAGE="🚀 Auto-sync $SERVICE_NAME service ($COMMIT_HASH)
 
-      - name: Copy updated service folder to main branch
-        run: |
-          SOURCE_PATH=/home/runner/work/Harmona/Harmona
-          DEST_PATH=main_branch/services/${{ env.SERVICE_NAME }}/
+Original commit: $COMMIT_MESSAGE
+Author: $COMMIT_AUTHOR
+Service: $SERVICE_NAME
+Branch: $CURRENT_BRANCH → main
+Path: $SERVICE_PATH/"
+          
+          # Commit the changes
+          git commit -m "$SYNC_MESSAGE"
+          
+          echo "✅ Committed changes for $SERVICE_NAME"
+          echo "📝 Original commit: $COMMIT_MESSAGE"
+        fi
 
-          echo "Branch: ${{ env.BRANCH_NAME }}"
-          echo "Service: ${{ env.SERVICE_NAME }}"
-          echo "Source: $SOURCE_PATH"
-          echo "Destination: $DEST_PATH"
+    - name: Push to main
+      if: steps.commit-changes.outputs.has_changes == 'true'
+      run: |
+        SERVICE_NAME="${{ steps.service-info.outputs.service_name }}"
+        
+        echo "⬆️ Pushing $SERVICE_NAME changes to main..."
+        git push origin main
+        echo "🎉 Successfully synced $SERVICE_NAME to main branch!"
 
-          if [ -d "$SOURCE_PATH" ]; then
-            echo "✅ Found source folder: $SOURCE_PATH"
-            echo "📁 Files and directories in $SOURCE_PATH:"
-            ls -la "$SOURCE_PATH"
-            echo "🔍 Tree structure of $SOURCE_PATH:"
-            find "$SOURCE_PATH" -type f | head -20
-            rm -rf "$DEST_PATH"
-            mkdir -p "$DEST_PATH"
-            cp -r "$SOURCE_PATH"/. "$DEST_PATH"
-            echo "✅ Copy completed"
-          else
-            echo "❌ Folder $SOURCE_PATH not found in branch."
-            echo "Available directories in current working directory:"
-            ls -la /home/runner/work/Harmona/Harmona
-            echo "Looking for services directory:"
-            find . -name "services" -type d
-            echo "All directories containing 'service' or similar:"
-            find . -name "*service*" -type d
-            exit 1
-          fi
+    - name: Restore original branch
+      run: |
+        CURRENT_BRANCH="${{ steps.service-info.outputs.current_branch }}"
+        git checkout "$CURRENT_BRANCH"
+        
+        # Restore any stashed changes
+        git stash pop || true
 
-      - name: Commit and push to main
-        run: |
-          cd main_branch
-          git config user.name "github-actions"
-          git config user.email "github-actions@github.com"
-          git add services/${{ env.SERVICE_NAME }}
-          git commit -m "Sync ${{ github.ref_name }} → main/services/${{ env.SERVICE_NAME }}" || echo "No changes to commit"
-          git push origin main
+    - name: Summary
+      run: |
+        SERVICE_NAME="${{ steps.service-info.outputs.service_name }}"
+        SERVICE_PATH="${{ steps.service-info.outputs.service_path }}"
+        CURRENT_BRANCH="${{ steps.service-info.outputs.current_branch }}"
+        HAS_CHANGES="${{ steps.commit-changes.outputs.has_changes }}"
+        
+        echo "📊 SYNC SUMMARY"
+        echo "==============="
+        echo "🏷️ Service: $SERVICE_NAME"
+        echo "🌿 Branch: $CURRENT_BRANCH"
+        echo "📂 Path: $SERVICE_PATH"
+        echo "🔄 Changes: $([ "$HAS_CHANGES" = "true" ] && echo "✅ Synced" || echo "ℹ️ No changes")"
+        echo "==============="
+        
+        if [ "$HAS_CHANGES" = "true" ]; then
+          echo "🎯 Main branch has been updated with the latest $SERVICE_NAME changes!"
+        else
+          echo "👍 Main branch is already up to date with $SERVICE_NAME!"
+        fi