From 8230828d968e55410ef9b0974776b044e1820168 Mon Sep 17 00:00:00 2001 From: Greg Anderson Date: Thu, 20 Sep 2018 14:42:01 -0700 Subject: [PATCH] Use either the 8.x or 9.x version of the Behat Drupal Extension depending on which version of Drupal we are using. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b946f7c1..6abea17b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,12 +37,12 @@ install: # For Drupal 8 install the behat drush endpoint. # Pins symfony/dependency-injection to match core. # @see https://github.com/jhedstrom/drupalextension/issues/413 - - test ${DRUPAL_VERSION} -ne 8 || composer require --prefer-source drupal/drupal-driver drush/drush:^9.0.0-dev symfony/dependency-injection:3.4.4 && (git clone https://github.com/drush-ops/behat-drush-endpoint.git drush/Commands/contrib/behat-drush-endpoint) + - test ${DRUPAL_VERSION} -ne 8 || composer require --prefer-source drupal/drupal-driver drush/drush:^9.0.0-dev symfony/dependency-injection:3.4.4 && (git clone --branch=9.x https://github.com/drush-ops/behat-drush-endpoint.git drush/Commands/contrib/behat-drush-endpoint) - composer install # Install drush globally. - (test ${DRUPAL_VERSION} -ne 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:^9.0.0-dev # Install the Behat Drush Endpoint for Drupal 7 tests. - - test ${DRUPAL_VERSION} -ne 7 || (git clone https://github.com/drush-ops/behat-drush-endpoint.git drush/behat-drush-endpoint && (cd drush/behat-drush-endpoint && composer install && cd -)) + - test ${DRUPAL_VERSION} -ne 7 || (git clone --branch=8.x https://github.com/drush-ops/behat-drush-endpoint.git drush/behat-drush-endpoint && (cd drush/behat-drush-endpoint && composer install && cd -)) # Pin node version. # @see http://austinpray.com/ops/2015/09/20/change-travis-node-version.html - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION