Merge pull request #7692 from open-sausages/pulls/4.1/composer-does-prefer-dist

Feature Set .gitattributes to ignore docs and tests folder, and …
This commit is contained in:
Damian Mooyman 2017-12-14 17:47:43 +13:00 committed by GitHub
commit c0efb7bb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

10
.gitattributes vendored
View File

@ -1,4 +1,12 @@
docs/ export-ignore /tests export-ignore
/docs export-ignore
/.tx export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/.scrutinizer.yml export-ignore
/*.dist export-ignore
/behat.yml export-ignore
# Line endings # Line endings
sake text eol=lf sake text eol=lf

View File

@ -81,7 +81,7 @@ before_script:
- composer require silverstripe/recipe-core:1.1.x-dev silverstripe/admin:1.1.x-dev silverstripe/versioned:1.1.x-dev --no-update - composer require silverstripe/recipe-core:1.1.x-dev silverstripe/admin:1.1.x-dev silverstripe/versioned:1.1.x-dev --no-update
- if [[ $PHPUNIT_TEST == cms ]] || [[ $BEHAT_TEST == cms ]]; then composer require silverstripe/recipe-cms:1.1.x-dev --no-update; fi - if [[ $PHPUNIT_TEST == cms ]] || [[ $BEHAT_TEST == cms ]]; then composer require silverstripe/recipe-cms:1.1.x-dev --no-update; fi
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Log constants to CI for debugging purposes # Log constants to CI for debugging purposes
- php ./tests/dump_constants.php - php ./tests/dump_constants.php