From c06430068c583e86665d6502bf3dfa69b00bbf9a Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 10 Nov 2020 15:37:53 +1300 Subject: [PATCH] MNT Use shared travis config, use sminnee/phpunit --- .travis.yml | 45 +++------------------------------------------ composer.json | 2 +- phpcs.xml.dist | 3 +++ 3 files changed, 7 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7642da..785d9ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,43 +1,4 @@ -language: php +version: ~> 1.0 -dist: trusty - -env: - global: - - COMPOSER_ROOT_VERSION=2.0.x-dev - - TRAVIS_NODE_VERSION="6" - -matrix: - include: - - php: 5.6 - env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=PGSQL PHPUNIT_TEST=1 - - php: 7.1 - env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 - - php: 7.1 - env: DB=MYSQL NPM_TEST=1 - -before_script: - - phpenv rehash - - phpenv config-rm xdebug.ini - - - composer validate - - composer require --no-update silverstripe/recipe-cms:4.3.x-dev silverstripe/admin:1.3.x-dev - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; 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 && (cd vendor/silverstripe/admin && yarn install --network-concurrency 1) && yarn run build; fi - -script: - - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi - - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi - - if [[ $NPM_TEST ]]; then git diff --name-status --relative=client; fi - - if [[ $NPM_TEST ]]; then yarn run test; fi - - if [[ $NPM_TEST ]]; then yarn run lint; fi - -after_success: - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi +import: + - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml diff --git a/composer.json b/composer.json index e38de55..a0236dc 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "silverstripe/versioned": "^1.3" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "squizlabs/php_codesniffer": "^3.0" }, "autoload": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 6e383f9..eff1d2e 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +