Skip to content

Commit 17ecf5f

Browse files
authored
Merge pull request #12 from ashnazg/ci
CI updates
2 parents 5a6f575 + 7a8a063 commit 17ecf5f

File tree

4 files changed

+283
-580
lines changed

4 files changed

+283
-580
lines changed

.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,37 @@ matrix:
1111

1212
install:
1313
- travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
14-
- travis_retry wget https://phar.io/releases/phive.phar
1514

1615
script:
1716
- ./vendor/bin/phpunit --no-coverage
1817

1918
jobs:
2019
include:
21-
- stage: coverage
20+
- stage: analysis
2221
php: 7.1
2322
script:
2423
- ./vendor/bin/phpunit
2524
after_script:
25+
- travis_retry wget --no-verbose https://phar.io/releases/phive.phar
2626
- travis_retry php phive.phar --no-progress install --trust-gpg-keys E82B2FB314E9906E php-coveralls/php-coveralls && ./tools/php-coveralls --verbose
27-
- travis_retry wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
27+
- travis_retry wget --no-verbose https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
2828

29-
- stage: lint
29+
- stage: analysis
3030
php: 7.1
3131
before_script:
32+
- travis_retry wget --no-verbose https://phar.io/releases/phive.phar
3233
- travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan
3334
script:
3435
- ./tools/phpstan analyse src --level max --configuration phpstan.neon
36+
37+
- stage: analysis
38+
php: 7.1
39+
script:
3540
- composer create-project symplify/easy-coding-standard temp/ecs ^3 && temp/ecs/bin/ecs check src tests
3641

3742
cache:
3843
directories:
39-
- $HOME/.composer/cache/files
44+
- $HOME/.composer
4045
- $HOME/.phive
4146

4247
notifications:

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
},
1717
"require": {
1818
"php": ">=7.1",
19-
"league/flysystem": "~1.0.41"
19+
"league/flysystem": ">=1.0.41"
2020
},
2121
"minimum-stability": "stable",
2222
"require-dev": {
23-
"mockery/mockery": "~1.0",
24-
"league/flysystem-memory": "~1.0",
25-
"phpunit/phpunit": "^6.5"
23+
"mockery/mockery": "~1",
24+
"league/flysystem-memory": "~1",
25+
"phpunit/phpunit": "~6"
2626
},
2727
"extra": {
2828
"branch-alias": {

0 commit comments

Comments
 (0)