From 6e14b6ee6bd636e58d7abdcde7e281dbbe764694 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 15 Dec 2016 21:13:04 +0100 Subject: [PATCH 1/5] Update ctools and tfa_basic contrib modules --- drupal-org.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drupal-org.make b/drupal-org.make index 52d96a8..0136a82 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -41,7 +41,7 @@ projects[hosting_dns][version] = 1.x 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 From c7d300c2e6b34f16f247fe902b31d367da8875aa Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 15 Dec 2016 21:18:15 +0100 Subject: [PATCH 2/5] change version information for release 3.9-beta1 --- hostmaster.make | 48 +----------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) mode change 100644 => 120000 hostmaster.make diff --git a/hostmaster.make b/hostmaster.make deleted file mode 100644 index e2efe90..0000000 --- a/hostmaster.make +++ /dev/null @@ -1,47 +0,0 @@ -core = 7.x -api = 2 - - - -; Includes - -; This makefile will make sure we get the development code from the Aegir -; modules instead of the tagged releases. -includes[hostmaster] = drupal-org.make - - - -; Aegir core - -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 - - - -; Modules - Aegir "golden" - -projects[hosting_git][download][type] = git -projects[hosting_git][download][branch] = 7.x-3.x - -projects[hosting_remote_import][download][type] = git -projects[hosting_remote_import][download][branch] = 7.x-3.x - -projects[hosting_site_backup_manager][download][type] = git -projects[hosting_site_backup_manager][download][branch] = 7.x-3.x - -projects[hosting_tasks_extra][download][type] = git -projects[hosting_tasks_extra][download][branch] = 7.x-3.x - -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 - -; Modules - Dev - -projects[devel][subdir] = developer -projects[devel_debug_log][subdir] = developer diff --git a/hostmaster.make b/hostmaster.make new file mode 120000 index 0000000..f5d0926 --- /dev/null +++ b/hostmaster.make @@ -0,0 +1 @@ +drupal-org.make \ No newline at end of file From 85459c431d8104aa45dc970f4273c4a3ce637a7c Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 15 Dec 2016 21:26:49 +0100 Subject: [PATCH 3/5] Revert "change version information for release 3.9-beta1" This reverts commit c7d300c2e6b34f16f247fe902b31d367da8875aa. --- hostmaster.make | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) mode change 120000 => 100644 hostmaster.make diff --git a/hostmaster.make b/hostmaster.make deleted file mode 120000 index f5d0926..0000000 --- a/hostmaster.make +++ /dev/null @@ -1 +0,0 @@ -drupal-org.make \ No newline at end of file diff --git a/hostmaster.make b/hostmaster.make new file mode 100644 index 0000000..e2efe90 --- /dev/null +++ b/hostmaster.make @@ -0,0 +1,47 @@ +core = 7.x +api = 2 + + + +; Includes + +; This makefile will make sure we get the development code from the Aegir +; modules instead of the tagged releases. +includes[hostmaster] = drupal-org.make + + + +; Aegir core + +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 + + + +; Modules - Aegir "golden" + +projects[hosting_git][download][type] = git +projects[hosting_git][download][branch] = 7.x-3.x + +projects[hosting_remote_import][download][type] = git +projects[hosting_remote_import][download][branch] = 7.x-3.x + +projects[hosting_site_backup_manager][download][type] = git +projects[hosting_site_backup_manager][download][branch] = 7.x-3.x + +projects[hosting_tasks_extra][download][type] = git +projects[hosting_tasks_extra][download][branch] = 7.x-3.x + +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 + +; Modules - Dev + +projects[devel][subdir] = developer +projects[devel_debug_log][subdir] = developer From cb91b76d011df3cfd6933b2c08a39fe0d27a192a Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 10 Nov 2016 21:26:47 +0100 Subject: [PATCH 4/5] Set the companion branches --- .travis.yml | 5 +++-- hostmaster.make | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) 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/hostmaster.make b/hostmaster.make index e2efe90..c5f4641 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 From b42137dad8eff7ab196f64b6676716b405a40fd3 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 5 Jan 2017 13:13:13 +0100 Subject: [PATCH 5/5] Switch to the 3.x branch of the hosting_dns module --- drupal-org.make | 2 +- hostmaster.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drupal-org.make b/drupal-org.make index 0136a82..9ecf84c 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -35,7 +35,7 @@ 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 diff --git a/hostmaster.make b/hostmaster.make index c5f4641..c3105d0 100644 --- a/hostmaster.make +++ b/hostmaster.make @@ -40,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