Skip to content

Commit e032740

Browse files
committed
Further testing
1 parent d9f43a4 commit e032740

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

deploy.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,32 @@ if [[ "$BUILD_DIR" = false ]]; then
131131
if [[ -e "$GITHUB_WORKSPACE/.distignore" ]]; then
132132
echo "ℹ︎ Using .distignore"
133133

134+
# Deleting the git data so that the repo is reinitialized
134135
rm -rf "$GITHUB_WORKSPACE/.git"
135136

137+
# Removing the existing .gitignore file to replace it with the .distignore file
136138
rm "$GITHUB_WORKSPACE/.gitignore"
137139

140+
# Renaming the .distignore file to .gitignore
138141
cp "$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/.gitignore"
139142

140143
cd "$GITHUB_WORKSPACE"
141144

145+
# Initializing the git repo for the new .gitignore file to be taken into account
142146
git init
143147

144148
git add . > /dev/null 2>&1
145149

150+
# Get the list files to be copied into a txt file.
146151
git ls-files > included-files.txt
147152

153+
# Return to the SVN dir.
148154
cd "$SVN_DIR"
149155

150156
# Copy from current branch to /trunk, excluding dotorg assets
151-
# The --filter flag will allow the full .gitignore syntax to be used in .distignore
157+
# The --files-from flag will only copy files from the included files list
152158
# The --delete flag will delete anything in destination that no longer exists in source
153159
# The --itemize-changes flag will show the changes made to each file
154-
155160
rsync -rcv --files-from="$GITHUB_WORKSPACE/included-files.txt" "$GITHUB_WORKSPACE/" trunk/ --delete --itemize-changes
156161
else
157162
echo "ℹ︎ Using .gitattributes"
@@ -217,7 +222,6 @@ fi
217222
# The force flag ensures we recurse into subdirectories even if they are already added
218223
# Suppress stdout in favor of svn status later for readability
219224
echo "➤ Preparing files..."
220-
221225
svn add . --force > /dev/null
222226

223227
# SVN delete all deleted files

0 commit comments

Comments
 (0)