From 6416f8762de931b040789379182721f31d3198b1 Mon Sep 17 00:00:00 2001 From: Janez Urevc Date: Fri, 19 Feb 2016 16:26:06 +0530 Subject: [PATCH 1/3] Support running tests based on 8.1.x. --- environments/drupal-8.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/environments/drupal-8.sh b/environments/drupal-8.sh index 4b8f108..c320a44 100644 --- a/environments/drupal-8.sh +++ b/environments/drupal-8.sh @@ -3,7 +3,7 @@ # Drupal-8 environment variables and functions. function drupal_ti_install_drupal() { - git clone --depth 1 --branch 8.0.x http://git.drupal.org/project/drupal.git + git clone --depth 1 --branch "$DRUPAL_TI_CORE_BRANCH" http://git.drupal.org/project/drupal.git cd drupal php -d sendmail_path=$(which true) ~/.composer/vendor/bin/drush.php --yes -v site-install "$DRUPAL_TI_INSTALL_PROFILE" --db-url="$DRUPAL_TI_DB_URL" drush use $(pwd)#default @@ -20,6 +20,10 @@ export DRUPAL_TI_DRUPAL_BASE="$TRAVIS_BUILD_DIR/../drupal-8" export DRUPAL_TI_DRUPAL_DIR="$DRUPAL_TI_DRUPAL_BASE/drupal" export DRUPAL_TI_DIST_DIR="$HOME/.dist" export PATH="$DRUPAL_TI_DIST_DIR/usr/bin:$PATH" +if [ -z "$DRUPAL_TI_CORE_BRANCH" ] +then + export DRUPAL_TI_CORE_BRANCH="8.0.x" +fi # Display used for running selenium browser. export DISPLAY=:99.0 From bf047ede05c9fed804ef1cc91390f958410522e9 Mon Sep 17 00:00:00 2001 From: Janez Urevc Date: Fri, 25 Mar 2016 16:04:42 +0100 Subject: [PATCH 2/3] Use 8.1.x by default. --- environments/drupal-8.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/drupal-8.sh b/environments/drupal-8.sh index c320a44..7fa0672 100644 --- a/environments/drupal-8.sh +++ b/environments/drupal-8.sh @@ -22,7 +22,7 @@ export DRUPAL_TI_DIST_DIR="$HOME/.dist" export PATH="$DRUPAL_TI_DIST_DIR/usr/bin:$PATH" if [ -z "$DRUPAL_TI_CORE_BRANCH" ] then - export DRUPAL_TI_CORE_BRANCH="8.0.x" + export DRUPAL_TI_CORE_BRANCH="8.1.x" fi # Display used for running selenium browser. From b2ce49cbeb59033e8b1170f80648e9114213f1a4 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Fri, 25 Mar 2016 14:13:52 +0100 Subject: [PATCH 3/3] Add composer install call --- environments/drupal-8.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/environments/drupal-8.sh b/environments/drupal-8.sh index 7fa0672..a3ac920 100644 --- a/environments/drupal-8.sh +++ b/environments/drupal-8.sh @@ -5,6 +5,7 @@ function drupal_ti_install_drupal() { git clone --depth 1 --branch "$DRUPAL_TI_CORE_BRANCH" http://git.drupal.org/project/drupal.git cd drupal + composer install php -d sendmail_path=$(which true) ~/.composer/vendor/bin/drush.php --yes -v site-install "$DRUPAL_TI_INSTALL_PROFILE" --db-url="$DRUPAL_TI_DB_URL" drush use $(pwd)#default }