Skip to content

Commit 00f872a

Browse files
authored
Merge pull request #19 from ashnazg/ci
CI updates
2 parents 2596137 + 40be100 commit 00f872a

File tree

12 files changed

+175
-957
lines changed

12 files changed

+175
-957
lines changed

.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-
vendor/*
12-
temp/*
13-
composer.phar
10+
build/
11+
vendor/
12+
temp/
13+
tools/
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 & 16 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

74
env:
85

@@ -12,34 +9,35 @@ matrix:
129
- php: nightly
1310

1411
install:
15-
- sudo apt install graphviz
16-
- composer install --no-interaction --prefer-dist --optimize-autoloader
12+
- travis_retry sudo apt install graphviz
13+
- travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
14+
- travis_retry wget https://phar.io/releases/phive.phar
15+
16+
script:
17+
- ./vendor/bin/phpunit --no-coverage
1718

1819
jobs:
1920
include:
20-
- stage: test
21-
script:
22-
- vendor/bin/phpunit --no-coverage
23-
2421
- stage: coverage
2522
php: 7.1
2623
script:
27-
- vendor/bin/phpunit
24+
- ./vendor/bin/phpunit
2825
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
26+
- 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
3128

3229
- stage: lint
3330
php: 7.1
3431
before_script:
35-
- composer create-project symplify/easy-coding-standard temp/ecs
32+
- travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan
3633
script:
37-
- temp/ecs/bin/ecs check src tests
38-
- vendor/bin/phpstan analyse src --level max --configuration phpstan.neon
34+
- ./tools/phpstan analyse src --level max --configuration phpstan.neon
35+
- composer create-project symplify/easy-coding-standard temp/ecs && temp/ecs/bin/ecs check src tests
3936

4037
cache:
4138
directories:
4239
- $HOME/.composer/cache/files
40+
- $HOME/.phive
4341

4442
notifications:
4543
irc: "irc.freenode.org#phpdocumentor"

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ install:
5353

5454
test_script:
5555
- cd c:\graphviz
56-
- vendor/bin/phpunit --no-coverage
56+
- vendor\bin\phpunit --no-coverage

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"require": {
99
"php": ">=7.1"
1010
},
11-
"require-dev": {
12-
"phpunit/phpunit": "~6.5",
13-
"phpstan/phpstan": "^0.9.0"
14-
},
1511
"autoload": {
1612
"psr-0": {"phpDocumentor": ["src/", "tests/unit"]}
13+
},
14+
"require-dev": {
15+
"phpunit/phpunit": "^6.5",
16+
"mockery/mockery": "^1.0"
1717
}
1818
}

0 commit comments

Comments
 (0)