Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit fe69de5

Browse files
committed
Updated Travis CI configuration
- use COVERAGE_DEPS env for php-coveralls - moved cs-check and coverage tests to run on PHP 7.1 with locked deps - added travis_retry on installing coveralls deps and uploading coverage
1 parent 66330a4 commit fe69de5

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

.travis.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@ sudo: false
22

33
language: php
44

5-
branches:
6-
except:
7-
- /^release-\d+\.\d+\.\d+.*$/
8-
- /^ghgfk-.*$/
9-
105
cache:
116
directories:
127
- $HOME/.composer/cache
138

149
env:
1510
global:
1611
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
1713

1814
matrix:
1915
include:
@@ -27,14 +23,12 @@ matrix:
2723
- php: 5.6
2824
env:
2925
- DEPS=latest
30-
- TEST_COVERAGE=true
3126
- php: 7
3227
env:
3328
- DEPS=lowest
3429
- php: 7
3530
env:
3631
- DEPS=locked
37-
- CS_CHECK=true
3832
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
3933
- php: 7
4034
env:
@@ -45,6 +39,8 @@ matrix:
4539
- php: 7.1
4640
env:
4741
- DEPS=locked
42+
- CS_CHECK=true
43+
- TEST_COVERAGE=true
4844
- php: 7.1
4945
env:
5046
- DEPS=latest
@@ -69,9 +65,6 @@ matrix:
6965
allow_failures:
7066
- php: hhvm
7167

72-
notifications:
73-
email: false
74-
7568
before_install:
7669
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
7770

@@ -80,12 +73,15 @@ install:
8073
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
8174
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
8275
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
83-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev $COMPOSER_ARGS php-coveralls/php-coveralls:^2.0 ; fi
76+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
8477
- stty cols 120 && composer show
8578

8679
script:
8780
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
8881
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
8982

9083
after_script:
91-
- if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls -v ; fi
84+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
85+
86+
notifications:
87+
email: false

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"@cs-check",
5050
"@test"
5151
],
52-
"upload-coverage": "coveralls -v",
5352
"cs-check": "phpcs",
5453
"cs-fix": "phpcbf",
5554
"test": "phpunit",

0 commit comments

Comments
 (0)