diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-03-10 12:39:57 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-03-11 10:56:50 +0000 |
| commit | 73e1a58f1aa492be12fc5aed20ad40a0c5fc0ff6 (patch) | |
| tree | 49fd3195f74b0b24be3b584fd5e6ab1cbca214c4 | |
| parent | b81363df2dfa13b3178a57178bcf287155b4b88a (diff) | |
Remove Vagrant reliance on install-script branch
Background IRC Chat:
2014-03-07T11:28:33+0000] <gareth> Why is the branch being replaced
here?
https://github.com/mysociety/alaveteli/blob/rails-3-develop/config/Vagra
ntfile#L18
[2014-03-07T11:29:55+0000] <gareth> It can't checkout install-script
branch as it doesn't exist
[2014-03-07T11:32:10+0000] <gareth> not sure how/why it could do this
when it fetched a new copy of the repo rather than using the host
checkout
[2014-03-07T11:35:42+0000] <louise> gareth that may be my fault - I
deleted a bunch of what I thought were old branches earlier this week -
perhaps install-script was one of them - let me look
[2014-03-07T11:36:58+0000] <louise> nope, doesn't look like it was -
mark, should the install-script branch exist?
[2014-03-07T11:38:18+0000] <mark> what the install script does is to
use the first of these that can be checked out: origin/install-script
0.15 origin/master
[2014-03-07T11:38:46+0000] <mark> but i must have created that
Vagrantfile while the install-script branch existed and worked, but the
master branch wouldn't
[2014-03-07T11:38:56+0000] <mark> i think now it'd be safe to take that
line out of the vagrant file
| -rw-r--r-- | config/Vagrantfile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/Vagrantfile b/config/Vagrantfile index fe071864e..c1ac1ead7 100644 --- a/config/Vagrantfile +++ b/config/Vagrantfile @@ -28,9 +28,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Fetch and run the install script: config.vm.provision :shell, :inline => "wget -O install-site.sh https://raw.github.com/mysociety/commonlib/master/bin/install-site.sh" config.vm.provision :shell, :inline => "chmod a+rx install-site.sh" - # This is only needed before the install-script branch is merged to - # master: - config.vm.provision :shell, :inline => "sed -i -e 's/BRANCH=master/BRANCH=install-script/' install-site.sh" config.vm.provision :shell, :inline => "./install-site.sh " \ "--dev " \ "alaveteli " \ |