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

Commit

Permalink
fix bookdown2mkdocs dep conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanotorresi committed May 27, 2016
1 parent 563c1bc commit 71eb100
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ matrix:
env:
- DEPS=locked
- TEST_COVERAGE=true
- EXECUTE_DOC_CHECK=true
- php: 5.6
env:
- DEPS=latest
- EXECUTE_DOC_CHECK=true
- php: 7
env:
- DEPS=lowest
Expand Down Expand Up @@ -61,11 +61,10 @@ before_install:
- if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi

install:

- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS phly/bookdown2mkdocs ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS phly/bookdown2mkdocs ; fi
- travis_retry composer install $COMPOSER_ARGS
- composer show

Expand Down

0 comments on commit 71eb100

Please sign in to comment.