From d1e241ed56508497e2908b81b2a41be3685f4aeb Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 20 Jan 2021 14:49:58 +1300 Subject: [PATCH] MNT Travis shared config --- .travis.yml | 63 +++----------------------------------------------- composer.json | 2 +- phpcs.xml.dist | 3 +++ 3 files changed, 7 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a25ba9..c244c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,61 +1,4 @@ -language: php +version: ~> 1.0 -dist: xenial - -services: - - mysql - - postgresql - -cache: - directories: - - $HOME/.composer/cache/files - -addons: - apt: - packages: - - poppler-utils - -env: - global: - - COMPOSER_ROOT_VERSION=3.1.x-dev - - SS_TIKA_ENDPOINT="http://localhost:9998/" - -matrix: - include: - - php: 5.6 - env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1 - - php: 7.1 - env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1 PDO=1 - - php: 7.2 - env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1 - - php: 7.3 - env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1 - - php: 7.4 - env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 - -before_script: - # Init PHP - - phpenv rehash - - phpenv config-rm xdebug.ini - - # Configure Tika bin - - mkdir -p $HOME/bin - - export PATH=$PATH:$HOME/bin - - ./.travis/install_tika.sh - - ($HOME/bin/tika-rest-server &) &> /dev/null - - # Install composer dependencies - - composer validate - - composer require --no-update silverstripe/recipe-cms:$RECIPE_VERSION - # Fix for running phpunit 5 on php 7.4+ - - composer require --no-update sminnee/phpunit-mock-objects:^3 - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - -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 - -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.yml diff --git a/composer.json b/composer.json index a867690..2793b0f 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "squizlabs/php_codesniffer": "^3", - "phpunit/phpunit": "^5.7" + "sminnee/phpunit": "^5.7" }, "autoload": { "psr-4": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index a504558..3d90009 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +