From 594b1b083fa085e5e17bd26d577e11dc55f37cf1 Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Wed, 28 Oct 2015 09:40:12 -0700 Subject: [PATCH 1/3] Updating Drush version to 8.0.0-rc2 commit. --- manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9a4471a..f653a92 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,8 +1,8 @@ class drush ( # By default, use the current HEAD of the recommended branch. - $git_ref = '6.x', - $configs = {}, - $run_composer_install = true + # Currently set to the 8.0.0-rc2 release commit. + $git_ref = "5cb73ea2f51cbfb60ddb2e37b94e4260e8c7d1e7", + $configs = {} ){ ensure_resource('package', 'git') From 2506d988c18b87e899e3a4916f0d36b5e2c3d4ba Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Wed, 28 Oct 2015 10:00:17 -0700 Subject: [PATCH 2/3] Changing settings to allow for drush to update properly if a different git_ref is set in puppet. --- manifests/init.pp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index f653a92..59b30cc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,7 +1,6 @@ class drush ( # By default, use the current HEAD of the recommended branch. - # Currently set to the 8.0.0-rc2 release commit. - $git_ref = "5cb73ea2f51cbfb60ddb2e37b94e4260e8c7d1e7", + $git_ref = "6.x", $configs = {} ){ @@ -63,19 +62,17 @@ require php::composer # Newer versions of drush require dependencies - if ($run_composer_install) { - exec { 'drush-composer-install': - command => '/usr/bin/php /usr/local/bin/composer install --no-dev', - cwd => '/var/lib/drush', - creates => '/var/lib/drush/vendor', - environment => 'HOME=/root/', - subscribe => Vcsrepo['/var/lib/drush'], - require => [ - Class['php::cli'], - Class['php::composer'], - Vcsrepo['/var/lib/drush'], - ], - } + exec { 'drush-composer-install': + command => "/usr/bin/php /usr/local/bin/composer install --no-dev", + cwd => "/var/lib/drush", + environment => "HOME=/root/", + require => [ + Class['php::cli'], + Class['php::composer'], + Vcsrepo['/var/lib/drush'], + ], + subscribe => Vcsrepo["/var/lib/drush"], + refreshonly => true } From d7837a91850fd812c21376ac87c1e3573584e98c Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Wed, 23 Mar 2016 12:34:29 -0400 Subject: [PATCH 3/3] Updating Drush to latest recommended release. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 59b30cc..ba27fdc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,6 @@ class drush ( # By default, use the current HEAD of the recommended branch. - $git_ref = "6.x", + $git_ref = "8.0.5", $configs = {} ){