Alternative approach

Author: kmgalanakis

deploy.sh

@@ -130,11 +130,44 @@ if [[ "$BUILD_DIR" = false ]]; then
 	echo "➤ Copying files..."
 	if [[ -e "$GITHUB_WORKSPACE/.distignore" ]]; then
 		echo "ℹ︎ Using .distignore"
+
+		rm -rf "$GITHUB_WORKSPACE/.git"
+
+		rm "$GITHUB_WORKSPACE/.gitignore"
+
+		cp "$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/.gitignore"
+
+		cd "$GITHUB_WORKSPACE"
+
+		git init
+
+		git add . > /dev/null 2>&1
+
+		git ls-files > ../included-files.txt
+
+		cd ..
+
+		echo "ℹ︎ Included files"
+
+		cat included-files.txt
+
 		# Copy from current branch to /trunk, excluding dotorg assets
 		# The --filter flag will allow the full .gitignore syntax to be used in .distignore
 		# The --delete flag will delete anything in destination that no longer exists in source
 		# The --itemize-changes flag will show the changes made to each file
-		rsync -rcv --filter="merge,- $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --itemize-changes
+
+		rsync -rcv --files-from=included-files.txt "$GITHUB_WORKSPACE/" trunk/ --delete --itemize-changes
+
+		echo "ℹ︎ LS current dir"
+
+		ls
+
+		echo "ℹ︎ LS trunk"
+
+		ls trunk/
+
+		echo "ℹ︎ Working dir"
+		pwd
 	else
 		echo "ℹ︎ Using .gitattributes"
 
@@ -199,6 +232,11 @@ fi
 # The force flag ensures we recurse into subdirectories even if they are already added
 # Suppress stdout in favor of svn status later for readability
 echo "➤ Preparing files..."
+
+echo "ℹ︎ Preparing files pwd"
+pwd
+
+
 svn add . --force > /dev/null
 
 # SVN delete all deleted files