From 2985b4a6e9f6aace7cca63b0f38fc25f6c067a01 Mon Sep 17 00:00:00 2001 From: Christopher Joe Date: Mon, 11 Dec 2017 12:01:56 +1300 Subject: [PATCH 1/2] Feature Set .gitattributes to ignore docs and tests folder, and some source asset files which are not needed --- .gitattributes | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 15fbf21a..865496fe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,18 @@ -docs/ export-ignore -javascript/src/ export-ignore -*.dist export-ignore +/tests export-ignore +/.tx 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 -javascript/dist/ -diff +/client/dist/js -diff +/client/dist/styles -diff From 6a24daa0938a441c609f8cb62befde1c71086f0e Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Mon, 18 Dec 2017 16:22:46 +1300 Subject: [PATCH 2/2] Update .travis.yml --- .travis.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 564e47b0..1de90f1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ language: php dist: trusty +sudo: required + +group: deprecated-2017Q4 + cache: directories: - $HOME/.composer/cache/files @@ -15,7 +19,7 @@ addons: env: global: - TRAVIS_NODE_VERSION="6" - - COMPOSER_ROOT_VERSION="4.x-dev" + - COMPOSER_ROOT_VERSION="4.1.x-dev" - DISPLAY=":99" - XVFBARGS=":99 -ac -screen 0 1024x768x16" - SS_BASE_URL="http://localhost:8080/" @@ -44,12 +48,10 @@ before_script: # Install composer dependencies - composer validate - - composer install --prefer-dist - - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.1.x-dev - - 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 + - composer require --no-update silverstripe/recipe-cms:1.1.x-dev + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; 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 - 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