Skip to content

Commit 861a123

Browse files
committed
Only require Sami on Travis build
Signed-off-by: Maurício Meneghini Fauth <[email protected]>
1 parent 1a99634 commit 861a123

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

.travis.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: php
2-
2+
sudo: false
33
dist: xenial
44

55
php:
@@ -13,19 +13,24 @@ matrix:
1313
allow_failures:
1414
- php: nightly
1515
include:
16-
- php: 7.2
17-
env: DOCS=yes
1816
- php: 7.1
19-
env: REQUIRE="phpmyadmin/motranslator:^3.0"
17+
name: "phpmyadmin/motranslator"
18+
install:
19+
- composer require "phpmyadmin/motranslator:^3.0"
20+
- composer install --no-interaction
21+
- php: 7.2
22+
name: "API docs"
23+
install:
24+
- composer global require "sami/sami:^4.0"
25+
- composer install --no-interaction
26+
script:
27+
- $HOME/.composer/vendor/bin/sami.php --no-interaction update ./tools/sami-config.php
2028
- php: nightly
2129
install:
2230
- composer install --no-interaction --ignore-platform-reqs
2331

24-
sudo: false
25-
2632
install:
27-
- if [ -n "$REQUIRE" ] ; then composer require "$REQUIRE" ; fi
28-
- composer install
33+
- composer install --no-interaction
2934

3035
after_success:
3136
- bash <(curl -s https://codecov.io/bash)
@@ -35,5 +40,4 @@ cache:
3540
- $HOME/.composer/cache
3641

3742
script:
38-
- if [ "$DOCS" != "yes" ] ; then ./vendor/bin/phpunit --configuration phpunit.xml.dist ; fi
39-
- if [ "$DOCS" = "yes" ] ; then ./vendor/bin/sami.php --no-interaction update ./tools/sami-config.php ; fi
43+
- vendor/bin/phpunit --configuration phpunit.xml.dist

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"phpmyadmin/coding-standard": "^1.0",
2424
"phpmyadmin/motranslator": "^4.0",
2525
"phpunit/php-code-coverage": "*",
26-
"phpunit/phpunit": "^7.4 || ^8",
27-
"sami/sami": "^4.0"
26+
"phpunit/phpunit": "^7.4 || ^8"
2827
},
2928
"conflict": {
3029
"phpmyadmin/motranslator": "<3.0"

0 commit comments

Comments
 (0)