From fb0c69f8771763c7ce13e5343e58d5555227fd12 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 28 Mar 2017 19:30:38 +1300 Subject: [PATCH] Only git-diff files in client folder We only care about the dist files. If we diff in the root folder, we'll get false positives on composer.json changes. See https://travis-ci.org/silverstripe/silverstripe-cms/jobs/215796957 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69fd8d11..17a809e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,8 +53,8 @@ before_script: script: - "if [ \"$PHPUNIT_TEST\" = \"1\" ]; then vendor/bin/phpunit tests flush=1; fi" - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat .; fi" - - "if [ \"$NPM_TEST\" = \"1\" ]; then git diff-files --quiet -w; fi" - - "if [ \"$NPM_TEST\" = \"1\" ]; then git diff -w --no-color; fi" + - "if [ \"$NPM_TEST\" = \"1\" ]; then git diff-files --quiet -w --relative=client; fi" + - "if [ \"$NPM_TEST\" = \"1\" ]; then git diff -w --no-color --relative=client; fi" - "if [ \"$NPM_TEST\" = \"1\" ]; then (nvm use $TRAVIS_NODE_VERSION && npm run lint); fi" - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ]; then vendor/bin/phpunit tests flush=1 --coverage-clover=coverage.xml; fi" - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi"