Merge pull request #55 from 10up/feat/auto-ignore-vendor-directory

Revert changes in vendor directory to fix SVN error

Author: dkotter

deploy.sh

@@ -53,7 +53,7 @@ svn update --set-depth infinity trunk
 echo "➤ Copying files..."
 if [ "$IGNORE_OTHER_FILES" = true ]; then
 	# Copy readme.txt to /trunk
-	cp "$GITHUB_WORKSPACE/$README_NAME" trunk/$README_NAME
+	cp "$GITHUB_WORKSPACE/$README_NAME" "trunk/$README_NAME"
 
 	# Use $TMP_DIR as the source of truth
 	TMP_DIR=$GITHUB_WORKSPACE
@@ -127,6 +127,22 @@ fi
 
 echo "➤ Preparing files..."
 
+# Maybe revert composer changes in the vendor directory.
+# This is needed because composer dynamically generates files using hashing.
+# In reality, the files are not changed, but SVN thinks they are and processing will be stopped.
+
+# Check if vendor/composer has changes
+if [[ -n $(svn stat trunk/vendor/composer) ]]; then
+    echo "ℹ︎ Reverting changes in vendor/composer directory"
+    svn revert --depth=infinity trunk/vendor/composer
+fi
+
+# Check if vendor/autoload.php has changes
+if [[ -n $(svn stat trunk/vendor/autoload.php) ]]; then
+    echo "ℹ︎ Reverting changes to vendor/autoload.php"
+    svn revert trunk/vendor/autoload.php
+fi
+
 svn status
 
 if [[ -z $(svn stat) ]]; then
@@ -168,7 +184,7 @@ svn add . --force > /dev/null
 # Also suppress stdout here
 svn status | grep '^\!' | sed 's/! *//' | xargs -I% svn rm %@ > /dev/null
 
-#Resolves => SVN commit failed: Directory out of date
+# Resolves => SVN commit failed: Directory out of date
 svn update
 
 # Now show full SVN status