diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 28e85a9f..00000000 --- a/.dockerignore +++ /dev/null @@ -1,10 +0,0 @@ -/.idea -/.git -/.dockerignore -/.editorconfig -/.gitattributes -/.github -/.gitignore -/composer.lock -/tests/runtime/* -/vendor diff --git a/.gitattributes b/.gitattributes index 7382fb1b..b209faad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,27 +16,25 @@ *.yml text # Ensure those won't be messed up with +*.phar binary *.png binary *.jpg binary *.gif binary *.ttf binary -# Ignore some meta files when creating an archive of this repository -/.github export-ignore -/.editorconfig export-ignore -/.gitattributes export-ignore -/.gitignore export-ignore -/.dockerignore export-ignore -/.phpunit-watcher.yml export-ignore -/.styleci.yml export-ignore -/infection.json.dist export-ignore -/psalm.xml export-ignore -/phpunit.xml.dist export-ignore -/Makefile export-ignore -/tests export-ignore -/docs export-ignore +# Exclude development and metadata files from distribution archive +* export-ignore +/config/ -export-ignore +/config/** -export-ignore +/src/ -export-ignore +/src/** -export-ignore +/stubs/ -export-ignore +/stubs/** -export-ignore +/CHANGELOG.md -export-ignore +/composer.json -export-ignore +/LICENSE.md -export-ignore +/README.md -export-ignore # Avoid merge conflicts in CHANGELOG # https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/ /CHANGELOG.md merge=union -