From a359518f9de58008a05a982c2f3644c16c1b3355 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 12 Nov 2020 14:40:57 +1300 Subject: [PATCH] MNT Use shared travis config, use sminnee/phpunit --- .travis.yml | 56 ++++---------------------------------------------- composer.json | 6 +----- phpcs.xml.dist | 3 +++ 3 files changed, 8 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac01b60..091ae92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,56 +1,8 @@ -language: php +version: ~> 1.0 -dist: trusty - -addons: - firefox: "31.0" +import: + - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-behat.yml env: global: - - COMPOSER_ROOT_VERSION=4.1.x-dev - - DISPLAY=":99" - - XVFBARGS=":99 -ac -screen 0 1024x768x16" - -matrix: - include: - - php: 5.6 - env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1 - - php: 7.1 - env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 - - php: 7.1 - env: DB=MYSQL RECIPE_VERSION=4.2.x-dev BEHAT_TEST=1 - - php: 7.2 - env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 - -before_script: - # Init PHP - - phpenv rehash - - phpenv config-rm xdebug.ini - - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - - # Install composer dependencies - - composer validate - - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION" - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - - # Start behat services - - if [[ $BEHAT_TEST ]]; then echo 'SS_BASE_URL=http://localhost:8080/' >> .env; fi - - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi - - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi - - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi - - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); 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/; fi - - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @contentreview; fi - -after_success: - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi - -after_failure: - - php ./framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/ + - BEHAT_SUITE=contentreview diff --git a/composer.json b/composer.json index 9830947..26357e3 100644 --- a/composer.json +++ b/composer.json @@ -27,11 +27,7 @@ "silverstripe/siteconfig": "^4.2" }, "require-dev": { - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3", - "silverstripe/behat-extension": "^3", - "silverstripe/serve": "^2", - "se/selenium-server-standalone": "2.41.0" + "silverstripe/recipe-testing": "^1" }, "suggest": { "symbiote/silverstripe-queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" diff --git a/phpcs.xml.dist b/phpcs.xml.dist index f6e295b..f3047d8 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +