Skip to content

Commit

Permalink
Merge pull request #50 from creative-commoners/pulls/2/fix-mergeup
Browse files Browse the repository at this point in the history
MNT Fix travis mergeup
  • Loading branch information
emteknetnz committed Nov 16, 2020
2 parents 7fbaca7 + f375243 commit b1959eb
Showing 1 changed file with 0 additions and 35 deletions.
35 changes: 0 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,4 @@ import:

env:
global:
<<<<<<< HEAD
- COMPOSER_ROOT_VERSION="2.x-dev"

matrix:
include:
- php: 5.6
env: DB=MYSQL PHPUNIT_TEST=1 RECIPE_VERSION="^1 --prefer-lowest"
- php: 7.1
env: DB=MYSQL PHPUNIT_TEST=1 RECIPE_VERSION="^1"
- php: 7.2
env: DB=PGSQL PHPUNIT_COVERAGE_TEST=1 RECIPE_VERSION="^4 --prefer-lowest"
- php: 7.3
env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 RECIPE_VERSION="^4"
- php: 7.4
env: DB=MYSQL PHPUNIT_TEST=1 RECIPE_VERSION="4.x-dev"

before_script:
- phpenv rehash
- phpenv config-rm xdebug.ini

- composer validate
- composer require --no-update silverstripe/recipe-cms:$RECIPE_VERSION
- composer require --no-update silverstripe/subsites:^2
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:^2 --no-update; 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
=======
- REQUIRE_EXTRA="silverstripe/subsites:^2"
>>>>>>> 2.2

0 comments on commit b1959eb

Please sign in to comment.