Skip to content

Commit

Permalink
Change syntax to dir-merge to see if direcotires are supported in the…
Browse files Browse the repository at this point in the history
… distignore file
  • Loading branch information
claytoncollie committed Aug 14, 2024
1 parent 225bc53 commit 64424d6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ if [[ "$BUILD_DIR" = false ]]; then
# 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
rsync -rc --filter="merge $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
rsync -rc --filter="dir-merge,- $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
else
echo "ℹ︎ Using .gitattributes"

Expand Down

0 comments on commit 64424d6

Please sign in to comment.