diff --git a/.travis.yml b/.travis.yml index 7df5cca..e9c68e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ env: globaL: - DOCKER_VERSION=1.11.2-0~trusty - DOCKER_COMPOSE_VERSION=1.7.1 - - AEGIR_HOSTING_VERSION=7.x-3.x + - AEGIR_HOSTING_VERSION=feature/quick-review + - AEGIR_PROVISION_VERSION=feature/quick-review - AEGIR_TESTS_VERSION=master #env: @@ -34,7 +35,7 @@ before_install: - git checkout $AEGIR_TESTS_VERSION # Get Hosting - - git clone http://git.drupal.org/project/hosting.git /home/travis/build/aegir-project/hosting + - git clone http://github.com/aegir-project/hosting.git /home/travis/build/aegir-project/hosting - cd /home/travis/build/aegir-project/hosting - git checkout $AEGIR_HOSTING_VERSION diff --git a/drupal-org.make b/drupal-org.make index 52d96a8..9ecf84c 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -35,13 +35,13 @@ projects[hosting_civicrm][subdir] = aegir projects[hosting_civicrm][version] = 3.8 projects[hosting_dns][subdir] = aegir -projects[hosting_dns][version] = 1.x +projects[hosting_dns][version] = 3.x ; Modules - contrib projects[admin_menu][version] = 3.0-rc5 projects[betterlogin][version] = 1.4 -projects[ctools][version] = 1.11 +projects[ctools][version] = 1.12 projects[entity][version] = 1.8 projects[openidadmin][version] = 1.0 projects[overlay_paths][version] = 1.3 @@ -52,7 +52,7 @@ projects[views_bulk_operations][version] = 3.3 ; Two factor authentication projects[libraries][version] = 2.3 projects[tfa][version] = 2.0 -projects[tfa_basic][version] = 1.0-beta3 +projects[tfa_basic][version] = 1.0 projects[tfa_basic][patch][] = "https://www.drupal.org/files/issues/use_libraries_module-2807953-8.patch" libraries[qrcodejs][download][type] = git diff --git a/hostmaster.make b/hostmaster.make index e2efe90..c3105d0 100644 --- a/hostmaster.make +++ b/hostmaster.make @@ -17,7 +17,8 @@ projects[eldir][download][type] = git projects[eldir][download][branch] = 7.x-3.x projects[hosting][download][type] = git -projects[hosting][download][branch] = 7.x-3.x +projects[hosting][download][url] = https://github.com/aegir-project/hosting.git +projects[hosting][download][branch] = feature/quick-review @@ -39,7 +40,7 @@ projects[hosting_civicrm][download][type] = git projects[hosting_civicrm][download][branch] = 7.x-3.x projects[hosting_dns][download][type] = git -projects[hosting_dns][download][branch] = 7.x-1.x +projects[hosting_dns][download][branch] = 7.x-3.x ; Modules - Dev