Skip to content

Commit

Permalink
Merge pull request #26 from webkinder/develop
Browse files Browse the repository at this point in the history
Update to support adding new files to distignore
  • Loading branch information
helen authored Mar 4, 2020
2 parents c40e1df + acd7b87 commit 517452a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if [[ -e "$GITHUB_WORKSPACE/.distignore" ]]; then
echo "ℹ︎ Using .distignore"
# Copy from current branch to /trunk, excluding dotorg assets
# The --delete flag will delete anything in destination that no longer exists in source
rsync -rc --exclude-from="$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete
rsync -rc --exclude-from="$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
else
echo "ℹ︎ Using .gitattributes"

Expand Down Expand Up @@ -89,7 +89,7 @@ else

# Copy from clean copy to /trunk, excluding dotorg assets
# The --delete flag will delete anything in destination that no longer exists in source
rsync -rc "$TMP_DIR/" trunk/ --delete
rsync -rc "$TMP_DIR/" trunk/ --delete --delete-excluded
fi

# Copy dotorg assets to /assets
Expand Down

0 comments on commit 517452a

Please sign in to comment.