Skip to content

Commit 5f9e995

Browse files
authored
Merge branch 'master' into debug_multi_packages
2 parents f178193 + c7503a4 commit 5f9e995

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

.travis.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
language: php
2-
32
php:
43
- 7.0
54
- 7.1
65
- 7.2
7-
86
before_script:
9-
- composer self-update
10-
- composer clear-cache
11-
- composer update
12-
7+
- composer self-update
8+
- composer clear-cache
9+
- composer update
1310
env:
1411
global:
15-
- GIT_NAME: "'Couscous auto deploy'"
16-
- GIT_EMAIL: d.negrier@thecodingmachine.com
17-
- GH_REF: github.com/thecodingmachine/discovery
18-
- secure: gIB5NdbKzqFrnZ3wREvQN59RnpGYyOrOn2RDS8q9LzBMppKYoC6QkF5zL8oFGr/N7nAFTbcugR8pJiirbVs0iI5TomALGtaNwgiBclqYdoAGtckiN1Ahk5FoKBv2/Zdft+zqL2On+eJEbFLxyiuONSwzSJmVpzIFYl5vpOuRsvAUcqfA2rAUOeshbU9FZ8dbKLwyTxaEnRpB7bNUssWBo+0QGFah7Pqty2i3KxxSNuT7HaVtrySWYmc54zbFFE21pQmIOFhVzMTIZ2HwbsxAiYPBODCaGRwTd+recw8yaquF8p1O2q/nXt93VvGxwpCORqLCTIIMPs4+HJUxuh10gup2EZ9Q1Hv1RY4vgulvuCABHY5DPoRXL+wPPONAJq3JZu/cCis4HHeMeaomulmzGhQloMndDxLh8lybzw6575QPcCWegRTrRm5afvwtkhTy9QTCgffsv8lvEHEW2waAXJuByVI9fTEnz4XIeESMwvnd3xFAu3/9XsfcvQTxi2yTAfrqXSPuHGO0WkBe49GYxz8Fz/jvW5VcbrEAywcEb9xYNDrfZYmCr2qXgbHblDzgQS//1HQUKsysTs3b0tKDMn4/0C+IW1AY8OD5bTfuicg5QuhFDruA4nqFqBaxQ9rWBAv7OPXUZGAOqUl0swtNr8AL6VE5ycEzH+a1bosBLlo=
19-
12+
- GIT_NAME: "'Couscous auto deploy'"
13+
- GIT_EMAIL: d.negrier@thecodingmachine.com
14+
- GH_REF: github.com/thecodingmachine/discovery
15+
- secure: vs6xOm99WVSwJO5et+0dxk315gpYn/K0QQy040CVBbqnTiG+bdh/wtndl6tI+xSzJiRxcoauQVhkvuuK+0uPCwPygdJWnO1WmnOLHDwnfV8JNOAy0FYVUqNzRpywiMGPAwEUnPJXHfFt5djOA9U6Dn7a3IjxUgj14GRSS2ig+uuriYH2ybxEOUFBlWlH94C2kiV9kbPakeDjfkqmibJwI5urZfK1McYA7t+ajYV3xIOubVAmOiVkOQDZMnVEkZunKec52Rka2MLXA7tJ8PMWxkqEnYvyHIDCEA2YYDmzF5gTHepmWzJodxl0aRY2529/DucObN5rfc61xB3wNxUPMDJcBGXzrR4NMV7Hy/trYsPy/5JcMceaS0QHGBrxMlHMuPrVZfbeLMtK9nSZ7pE3lkZXi1UnU0IohO56dYCXYJmv26DKOoY8UQC14Kf2tkqNyMzykp/beJ6QH7sYFOBojBVnLl/VCz/U5j7YtkZ5aKrzy7C39T4kLnCzggKDWSHPHuQtWqTWOVgk8wzoqbhQw/Aexh+LkUCWjAN2NNgFkVDtkcGD4WD7YCP27qo+huP6NUdsBRSYlsMvvymRIrhw7jQs4qF1Eg6AxJKB0zOFHHXrU2ClbV09umfILxp2HN5laHG8Jhrqf9WBUFBEzhpP7izFPT4oVhggOxKNWwHoT88=
2016
script:
21-
- cd tests; ./run.sh
22-
- cd ..; vendor/bin/phpunit
23-
- ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/unitTests --config-set ignore_warnings_on_exit 1
24-
- ./vendor/bin/humbug
25-
17+
- cd tests; ./run.sh
18+
- cd ..; vendor/bin/phpunit
19+
- "./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/unitTests --config-set ignore_warnings_on_exit
20+
1"
21+
- "./vendor/bin/humbug"
2622
after_script:
27-
- php vendor/bin/coveralls -v
28-
- ./vendor/bin/couscous travis-auto-deploy --php-version=7.1
23+
- php vendor/bin/coveralls -v
24+
- "./vendor/bin/couscous travis-auto-deploy --php-version=7.1"

couscous.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ icon:
2222
body:
2323
bg: doc/img/bg.jpg
2424

25+
google_analytics: UA-10196481-3
26+
2527
githubForkUrl: https://github.com/thecodingmachine/discovery/blob/1.1/
2628
githubUrl: https://github.com/thecodingmachine/discovery
2729

doc/img/logo-large.png

15.1 KB
Loading

doc/img/logo.png

-9.47 KB
Loading

0 commit comments

Comments
 (0)