Merge pull request #53 from carstenartur/copilot/update-sync-upstream-workflow-again

Author: carstenartur

.github/workflows/sync-upstream.yml

@@ -38,11 +38,14 @@ jobs:
           # Create temporary directory for fork-specific files
           mkdir -p /tmp/fork-specific
           
-          # Get list of all files in current branch
-          FILES_TO_CHECK=$(git ls-tree -r HEAD --name-only 2>/dev/null || echo "")
+          # Identify fork-specific workflow files (files that don't exist in upstream)
+          git fetch upstream master
+          
+          # Get list of workflow files in fork
+          FORK_WORKFLOWS=$(git ls-tree -r HEAD --name-only .github/workflows/ 2>/dev/null || echo "")
           
           # For each file in fork, check if it exists in upstream (files that don't = fork-specific)
-          for file in $FILES_TO_CHECK; do
+          for file in $FORK_WORKFLOWS; do
             if ! git cat-file -e upstream/master:"$file" 2>/dev/null; then
               echo "Fork-specific file: $file"
               # Create directory structure and copy file
@@ -52,7 +55,7 @@ jobs:
           done
           
           # Check if any fork-specific files were found
-          if [ -d "/tmp/fork-specific" ] && find /tmp/fork-specific -type f -print -quit | grep -q .; then
+          if [ -d "/tmp/fork-specific/.github" ]; then
             echo "has_fork_files=true" >> $GITHUB_OUTPUT
             echo "Found fork-specific files:"
             find /tmp/fork-specific -type f
@@ -69,13 +72,13 @@ jobs:
       - name: Restore fork-specific files
         if: steps.backup.outputs.has_fork_files == 'true'
         run: |
-          # Copy all fork-specific files back
+          # Copy fork-specific files back
           if [ -d "/tmp/fork-specific" ]; then
-            cp -r /tmp/fork-specific/* ./ 2>/dev/null || true
+            cp -r /tmp/fork-specific/.github ./ 2>/dev/null || true
           fi
           
           # Add all fork-specific changes
-          git add .
+          git add .github/
 
       - name: Commit fork-specific changes
         if: steps.backup.outputs.has_fork_files == 'true'
@@ -95,7 +98,9 @@ jobs:
 
   sync-manual:
     name: Sync Fork (Manual)
-    if: contains(github.event.comment.body, '/sync-upstream')
+    if: |
+      github.event_name == 'issue_comment' &&
+      contains(github.event.comment.body, '/sync-upstream')
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -173,11 +178,14 @@ jobs:
           # Create temporary directory for fork-specific files
           mkdir -p /tmp/fork-specific
           
-          # Get list of all files in current branch
-          FILES_TO_CHECK=$(git ls-tree -r HEAD --name-only 2>/dev/null || echo "")
+          # Identify fork-specific workflow files (files that don't exist in upstream)
+          git fetch upstream master
+          
+          # Get list of workflow files in fork
+          FORK_WORKFLOWS=$(git ls-tree -r HEAD --name-only .github/workflows/ 2>/dev/null || echo "")
           
           # For each file in fork, check if it exists in upstream (files that don't = fork-specific)
-          for file in $FILES_TO_CHECK; do
+          for file in $FORK_WORKFLOWS; do
             if ! git cat-file -e upstream/master:"$file" 2>/dev/null; then
               echo "Fork-specific file: $file"
               # Create directory structure and copy file
@@ -187,7 +195,7 @@ jobs:
           done
           
           # Check if any fork-specific files were found
-          if [ -d "/tmp/fork-specific" ] && find /tmp/fork-specific -type f -print -quit | grep -q .; then
+          if [ -d "/tmp/fork-specific/.github" ]; then
             echo "has_fork_files=true" >> $GITHUB_OUTPUT
             echo "Found fork-specific files:"
             find /tmp/fork-specific -type f
@@ -206,13 +214,13 @@ jobs:
       - name: Restore fork-specific files
         if: steps.backup.outputs.has_fork_files == 'true'
         run: |
-          # Copy all fork-specific files back
+          # Copy fork-specific files back
           if [ -d "/tmp/fork-specific" ]; then
-            cp -r /tmp/fork-specific/* ./ 2>/dev/null || true
+            cp -r /tmp/fork-specific/.github ./ 2>/dev/null || true
           fi
           
           # Add all fork-specific changes
-          git add .
+          git add .github/
 
       - name: Commit fork-specific changes
         if: steps.backup.outputs.has_fork_files == 'true'