tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Feature Set .gitattributes to ignore docs and tests folder, and …
This commit is contained in:
Damian Mooyman 2017-12-18 17:50:35 +13:00 committed by GitHub
commit 3efcd09f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitattributes vendored
View File

@ -1,6 +1,18 @@
docs/ export-ignore /tests export-ignore
javascript/src/ export-ignore /.tx export-ignore
*.dist export-ignore /.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/*.dist export-ignore
/behat.yml export-ignore
/client/src export-ignore
/webpack.config.js export-ignore
/.eslintignore export-ignore
/.eslintrc.js
/.sass-lint.yml
/yarn.lock export-ignore
# Hide diffs # Hide diffs
javascript/dist/ -diff /client/dist/js -diff
/client/dist/styles -diff

14
.travis.yml
View File

@ -2,6 +2,10 @@ language: php
dist: trusty dist: trusty
sudo: required
group: deprecated-2017Q4
cache: cache:
directories: directories:
- $HOME/.composer/cache/files - $HOME/.composer/cache/files
@ -15,7 +19,7 @@ addons:
env: env:
global: global:
- TRAVIS_NODE_VERSION="6" - TRAVIS_NODE_VERSION="6"
- COMPOSER_ROOT_VERSION="4.x-dev" - COMPOSER_ROOT_VERSION="4.1.x-dev"
- DISPLAY=":99" - DISPLAY=":99"
- XVFBARGS=":99 -ac -screen 0 1024x768x16" - XVFBARGS=":99 -ac -screen 0 1024x768x16"
- SS_BASE_URL="http://localhost:8080/" - SS_BASE_URL="http://localhost:8080/"
@ -44,12 +48,10 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer install --prefer-dist - composer require --no-update silverstripe/recipe-cms:1.1.x-dev
- composer require --prefer-dist --no-update silverstripe/recipe-cms:1.1.x-dev - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
- composer update
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --prefer-dist; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.1.x-dev --prefer-dist; 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-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Install NPM dependencies # Install NPM dependencies
- if [[ $NPM_TEST ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && npm install -g yarn && yarn install --network-concurrency 1 && yarn run build; fi - if [[ $NPM_TEST ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && npm install -g yarn && yarn install --network-concurrency 1 && yarn run build; fi