Tests

Author: kmgalanakis

deploy.sh

@@ -131,32 +131,34 @@ if [[ "$BUILD_DIR" = false ]]; then
 	if [[ -e "$GITHUB_WORKSPACE/.distignore" ]]; then
 		echo "ℹ︎ Using .distignore"
 
-		rm -rf "$GITHUB_WORKSPACE/.git"
+		# rm -rf "$GITHUB_WORKSPACE/.git"
 
-		rm "$GITHUB_WORKSPACE/.gitignore"
+		# rm "$GITHUB_WORKSPACE/.gitignore"
 
-		cp "$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/.gitignore"
+		# cp "$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/.gitignore"
 
-		cd "$GITHUB_WORKSPACE"
+		# cd "$GITHUB_WORKSPACE"
 
-		git init
+		# git init
 
-		git add . > /dev/null 2>&1
+		# git add . > /dev/null 2>&1
 
-		git ls-files > ../included-files.txt
+		# git ls-files > ../included-files.txt
 
-		cd ..
+		# cd ..
 
-		echo "ℹ︎ Included files"
+		# echo "ℹ︎ Included files"
 
-		cat included-files.txt
+		# 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 --files-from=included-files.txt "$GITHUB_WORKSPACE/" trunk/ --delete --itemize-changes
+		# rsync -rcv --files-from=included-files.txt "$GITHUB_WORKSPACE/" trunk/ --delete --itemize-changes
+
+		rsync -rcv --filter="merge,- $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --itemize-changes
 
 		echo "ℹ︎ LS current dir"