diff --git a/.gitattributes b/.gitattributes index f9e806c..34aa9c2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -63,3 +63,4 @@ core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-sp *.ttf -text diff *.woff -text diff *.woff2 -text diff +vendor/ -text diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 226220f..8cd5f84 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -13,6 +13,8 @@ cd dchadwick echo "Copying local repo to build dir\n" rsync -av --exclude-from="$LOCAL_REPO/scripts/rsync-exclude.txt" $LOCAL_REPO/ . +rm .gitignore +git rm --cached .gitignore composer install --no-dev --prefer-dist --no-interaction find . -mindepth 2 -type d -name ".git" -exec rm -rf {} + git add -A diff --git a/scripts/rsync-exclude.txt b/scripts/rsync-exclude.txt index 43a5695..08c85fb 100644 --- a/scripts/rsync-exclude.txt +++ b/scripts/rsync-exclude.txt @@ -15,3 +15,4 @@ web/modules/contrib web/themes/contrib web/sites/simpletest web/profiles/contrib +web/sites/default/files