Merge pull request #111 from hackforla/deploy_patch

dix deploy bug with change file

Author: wesley115

.github/scripts/clasp_push.sh

@@ -3,43 +3,51 @@ export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 
 # Function to check if a directory contains any of the changed files
-# Returns 0 if the directory contains changes, 1 otherwise
 function contains_changes() {
-  # If no changed files are provided, assume no changes
-  [[ "${*:2}" = "" ]] && return 1
-  for f in "${@:2}"; do
-    case $(realpath "$f")/ in 
-      $(realpath "$1")/*) return 0;;
-    esac
+  local dir="$1"
+  shift
+  [[ "$*" == "" ]] && { echo "No changed files provided, skipping $dir"; return 1; }
+  for f in "$@"; do
+    if [[ $(realpath "$f" 2>/dev/null)/ == $(realpath "$dir")/* ]]; then
+      echo "Found changed file $f in $dir"
+      return 0
+    fi
   done
+  echo "No changed files in $dir"
   return 1
 }
+# Debug input
+echo "Input changed files: $@"
 
-# Get the unique directories of the changed files
-# This helps in identifying which directories have modifications
-changed_files=$(echo "${@:1}" | xargs realpath | xargs -I {} dirname {}| sort -u | uniq)
-
-# Initialize an array to hold directories containing .clasp.json files
-dirs=()
+# Convert changed files to absolute paths and get unique directories
+changed_files=""
+if [ $# -gt 0 ]; then
+  changed_files=$(echo "$@" | xargs -n1 realpath 2>/dev/null | xargs -I {} dirname {} | sort -u)
+fi
+echo "Changed directories: $changed_files"
 
 # Find all directories containing .clasp.json files, which indicate Clasp projects
-# Use absolute paths for accuracy
-IFS=$'\n' read -r -d '' -a dirs < <( find . -name '.clasp.json' -exec dirname '{}' \; | sort -u | xargs realpath )
+IFS=$'\n' read -r -d '' -a dirs < <(find . -name '.clasp.json' -exec dirname {} \; | sort -u | xargs realpath)
+echo "Clasp project directories: ${dirs[@]}"
 
 exit_code=0
 
 # Process each Clasp project directory
 for dir in "${dirs[@]}"; do
-  pushd "${dir}" > /dev/null || exit
+  pushd "$dir" > /dev/null || { echo "Failed to enter $dir"; exit 1; }
   # Skip if the directory does not contain any changed files
-  contains_changes "$dir" "${changed_files[@]}" || continue
-  echo "Publishing ${dir}"
+  if ! contains_changes "$dir" "$@"; then
+    popd > /dev/null
+    continue
+  fi
+  echo "Publishing $dir"
   clasp push -f
   status=$?
   if [ $status -ne 0 ]; then
+    echo "clasp push failed in $dir with status $status"
     exit_code=$status
   fi
-  popd > /dev/null || exit
+  popd > /dev/null
 done
 
 if [ $exit_code -ne 0 ]; then

.github/workflows/deploy.yml

@@ -22,16 +22,11 @@ jobs:
         id: changed-files
         run: |
           if [[ "${{ github.event_name }}" == "push" ]]; then
-            # For push to main: diff against previous commit
-            echo "all_changed_files<<EOF" >> $GITHUB_OUTPUT
-            git diff --name-only HEAD~1 || true
-            echo "EOF" >> $GITHUB_OUTPUT
+            CHANGED_FILES=$(git diff --name-only HEAD~1 | tr '\n' ' ' || true)
           else
-            # For workflow_dispatch or other: diff against main (or use empty for full push)
-            echo "all_changed_files<<EOF" >> $GITHUB_OUTPUT
-            git diff --name-only origin/main || true
-            echo "EOF" >> $GITHUB_OUTPUT
+            CHANGED_FILES=$(git diff --name-only origin/main | tr '\n' ' ' || true)
           fi
+          echo "all_changed_files=$CHANGED_FILES" >> $GITHUB_OUTPUT
 
       - name: Debug changed files
         run: |

src/ClaspTestScript/Code.js

@@ -10,4 +10,5 @@ function Run() {
     Logger.log("Test4");
     Logger.log("9/25");
     Logger.log("9/25-1");
+    Logger.log("9/25-2");
   }

src/dummyscript/Code.js

@@ -4,4 +4,5 @@ function myFunction() {
   Logger.log("Test4");
   Logger.log("Test9/23");
   Logger.log("9/25-1");
+  Logger.log("9/25-2");
 }