Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 71eb100

Browse files
fix bookdown2mkdocs dep conflict
1 parent 563c1bc commit 71eb100

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ matrix:
2626
env:
2727
- DEPS=locked
2828
- TEST_COVERAGE=true
29-
- EXECUTE_DOC_CHECK=true
3029
- php: 5.6
3130
env:
3231
- DEPS=latest
32+
- EXECUTE_DOC_CHECK=true
3333
- php: 7
3434
env:
3535
- DEPS=lowest
@@ -61,11 +61,10 @@ before_install:
6161
- if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
6262

6363
install:
64-
64+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
65+
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS phly/bookdown2mkdocs ; fi
6566
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
6667
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
67-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
68-
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS phly/bookdown2mkdocs ; fi
6968
- travis_retry composer install $COMPOSER_ARGS
7069
- composer show
7170

0 commit comments

Comments
 (0)