Skip to content

Commit

Permalink
Travis config update, remove branch aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
dnsl48 committed Oct 31, 2019
1 parent aa6a833 commit c2feaa3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 14 deletions.
26 changes: 18 additions & 8 deletions .travis.yml
@@ -1,18 +1,28 @@
language: php

dist: xenial

services:
- mysql
- postgresql

addons:
apt:
packages:
- tidy


env:
global:
- COMPOSER_ROOT_VERSION=1.x-dev

matrix:
include:
- php: 5.6
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.0
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.2
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
- php: 7.3
env: DB=MYSQL PHPUNIT_TEST=1

before_script:
Expand All @@ -23,13 +33,13 @@ before_script:

# Install composer dependencies
- composer validate
- composer require --no-update silverstripe/recipe-cms:1.x-dev
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
- composer require --no-update silverstripe/recipe-cms:^4
- composer install --prefer-source --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/ *.php; fi
- if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/ *.php; fi

after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
7 changes: 1 addition & 6 deletions composer.json
Expand Up @@ -9,17 +9,12 @@
"license": "BSD-3-Clause",
"require": {
"cwp/cwp": "^2",
"silverstripe/fulltextsearch": "^3@dev"
"silverstripe/fulltextsearch": "^3"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3"
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"CWP\\Search\\": "src/",
Expand Down

0 comments on commit c2feaa3

Please sign in to comment.