Skip to content

Commit 4c95c0c

Browse files
committed
Replace --exclude-from with --filter to allow for .gitignore syntax in .distignore
1 parent 9273e6d commit 4c95c0c

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

deploy.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ if [[ "$BUILD_DIR" = false ]]; then
9494
if [[ -e "$GITHUB_WORKSPACE/.distignore" ]]; then
9595
echo "ℹ︎ Using .distignore"
9696
# Copy from current branch to /trunk, excluding dotorg assets
97+
# The --filter flag will allow the full .gitignore syntax to be used in .distignore
9798
# The --delete flag will delete anything in destination that no longer exists in source
98-
rsync -rc --exclude-from="$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
99+
rsync -rc --filter="merge $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
99100
else
100101
echo "ℹ︎ Using .gitattributes"
101102

0 commit comments

Comments
 (0)