From 1e889a35f6b52717458cba187ef3b0672024ddc6 Mon Sep 17 00:00:00 2001 From: Bec White Date: Tue, 14 Jan 2020 11:53:08 -0600 Subject: [PATCH 1/3] Add a trigger to update the installed version of composer on vagrant up (#68) --- conf/vagrant/Vagrantfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conf/vagrant/Vagrantfile b/conf/vagrant/Vagrantfile index 1c403e1..8dc0263 100644 --- a/conf/vagrant/Vagrantfile +++ b/conf/vagrant/Vagrantfile @@ -86,4 +86,11 @@ Vagrant.configure(2) do |config| } end + config.trigger.after [:up, :reload] do |trigger| + trigger.name = "Composer self-update" + trigger.run_remote = { + inline: "sudo -H composer self-update" + } + end + end From c027143f301316c5d709e4ad58a74d47546ce5b9 Mon Sep 17 00:00:00 2001 From: Bec White Date: Tue, 14 Jan 2020 11:59:21 -0600 Subject: [PATCH 2/3] Update the changelog. --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9994d78..025e95b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## UNRELEASED +### Added + +* Added a trigger to the default Vagrantfile that keeps the installed version of Composer up to date (#68) + ### Changed * Removed the custom drush wrapper in ~/bin. Drush 9 handles this itself. @@ -9,7 +13,8 @@ ### Updating from 2.5 * This update does **not** require destroying your current vagrant box. -* As a developer, you may want to: +* This version includes changes to the `Vagrantfile` template. To get these changes, either re-run the-vagrant's installer with `vendor/bin/the-vagrant-installer`, OR manually apply the changes from the [diff from #69](https://github.com/palantirnet/the-vagrant/pull/69/files). +* As a developer, you may also want to: 1. From your Vagrant box, `rm ~/bin/drush` 2. Log out of your vagrant and then back in before continuing to work From 34e49c079c2474501f979d973d7971dce3cc07e0 Mon Sep 17 00:00:00 2001 From: Bec White Date: Tue, 14 Jan 2020 18:39:26 -0600 Subject: [PATCH 3/3] Remove the trigger that ran composer install on vagrant up. --- CHANGELOG.md | 3 ++- conf/vagrant/Vagrantfile | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 025e95b..e513fc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,12 @@ ### Changed * Removed the custom drush wrapper in ~/bin. Drush 9 handles this itself. +* Removed the `vagrant up` trigger that ran `composer install` on the project ### Updating from 2.5 * This update does **not** require destroying your current vagrant box. -* This version includes changes to the `Vagrantfile` template. To get these changes, either re-run the-vagrant's installer with `vendor/bin/the-vagrant-installer`, OR manually apply the changes from the [diff from #69](https://github.com/palantirnet/the-vagrant/pull/69/files). +* This version includes changes to the `Vagrantfile` template. To get these changes, either re-run the-vagrant's installer with `vendor/bin/the-vagrant-installer`, OR manually apply the changes from the [diff from #70](https://github.com/palantirnet/the-vagrant/pull/70/files). * As a developer, you may also want to: 1. From your Vagrant box, `rm ~/bin/drush` 2. Log out of your vagrant and then back in before continuing to work diff --git a/conf/vagrant/Vagrantfile b/conf/vagrant/Vagrantfile index 8dc0263..0e5daf9 100644 --- a/conf/vagrant/Vagrantfile +++ b/conf/vagrant/Vagrantfile @@ -79,13 +79,6 @@ Vagrant.configure(2) do |config| end end - config.trigger.before [:up, :reload] do |trigger| - trigger.name = "Composer Install" - trigger.run = { - inline: "composer install --ignore-platform-reqs" - } - end - config.trigger.after [:up, :reload] do |trigger| trigger.name = "Composer self-update" trigger.run_remote = {