Skip to content

Commit cd3bee0

Browse files
authored
Merge pull request #151 from ashnazg/ci
CI updates
2 parents 25ec30d + 00c87ba commit cd3bee0

11 files changed

+95
-2171
lines changed

.coveralls.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
.settings
88

99
# Build folder and vendor folder are generated code; no need to version this
10-
build/*
11-
temp/*
12-
vendor/*
13-
composer.phar
10+
build/
11+
temp/
12+
tools/
13+
vendor/
14+
*.phar
1415

1516
# By default the phpunit.xml.dist is provided; you can override this using a local config file
1617
phpunit.xml

.travis.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
language: php
2-
php:
3-
- 7.1
4-
- 7.2
5-
- nightly
2+
php: [ 7.1, 7.2, nightly ]
63
sudo: false
74

85
env:
@@ -13,33 +10,35 @@ matrix:
1310
- php: nightly
1411

1512
install:
16-
- composer install --no-interaction --prefer-dist --optimize-autoloader
13+
- travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
14+
- travis_retry composer global require phpunit/phpunit # cannot use phpunit.phar or require-dev, because this package is a phpunit dep
15+
- travis_retry wget --no-verbose https://phar.io/releases/phive.phar
16+
17+
script:
18+
- /home/travis/.composer/vendor/bin/phpunit --no-coverage
1719

1820
jobs:
1921
include:
20-
- stage: test
21-
script:
22-
- vendor/bin/phpunit --no-coverage
23-
2422
- stage: coverage
2523
php: 7.1
2624
script:
27-
- vendor/bin/phpunit
25+
- /home/travis/.composer/vendor/bin/phpunit
2826
after_script:
29-
- wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
30-
- wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar && php coveralls.phar --verbose
27+
- travis_retry php phive.phar --no-progress install --trust-gpg-keys E82B2FB314E9906E php-coveralls/php-coveralls && ./tools/php-coveralls --verbose
28+
- travis_retry wget --no-verbose https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
3129

3230
- stage: lint
3331
php: 7.1
3432
before_script:
35-
- composer create-project symplify/easy-coding-standard temp/ecs
33+
- travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan
3634
script:
37-
- temp/ecs/bin/ecs check src tests
38-
- vendor/bin/phpstan analyse src --level max --configuration phpstan.neon
35+
- ./tools/phpstan analyse src --level max --configuration phpstan.neon
36+
- composer create-project symplify/easy-coding-standard temp/ecs && temp/ecs/bin/ecs check src tests
3937

4038
cache:
4139
directories:
4240
- $HOME/.composer/cache/files
41+
- $HOME/.phive
4342

4443
notifications:
4544
irc: "irc.freenode.org#phpdocumentor"

appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ install:
4848
- IF NOT EXIST php-installed.txt type nul >> php-installed.txt
4949
- cd c:\reflectiondocblock
5050
- composer install --no-interaction --prefer-dist --no-progress
51+
- composer global require phpunit/phpunit
52+
- composer global config bin-dir --absolute
5153

5254
test_script:
5355
- cd c:\reflectiondocblock
54-
- vendor/bin/phpunit --no-coverage
56+
- c:\Users\appveyor\AppData\Roaming\Composer\vendor\bin\phpunit --no-coverage

composer.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99
"email": "me@mikevanriel.com"
1010
}
1111
],
12+
"minimum-stability": "alpha",
1213
"require": {
13-
"php": "^7.1",
14-
"phpdocumentor/reflection-common": "^1.0",
15-
"phpdocumentor/type-resolver": "^0.5",
16-
"webmozart/assert": "^1.0"
14+
"php": ">=7.1",
15+
"phpdocumentor/type-resolver": "^0",
16+
"webmozart/assert": "^1"
1717
},
1818
"require-dev": {
19-
"mockery/mockery": "^1.0",
20-
"phpunit/phpunit": "^6.4",
21-
"doctrine/instantiator": "^1.0",
22-
"phpstan/phpstan": "^0.9.0"
19+
"mockery/mockery": "^1",
20+
"doctrine/instantiator": "^1"
2321
},
2422
"autoload": {
2523
"psr-4": {

0 commit comments

Comments
 (0)