Skip to content

Commit

Permalink
Merge pull request #158 from lemberg/feature/157-vagrant-ppa
Browse files Browse the repository at this point in the history
Switch to unofficial Vagrant PPA on Travis
  • Loading branch information
T2L committed Mar 2, 2020
2 parents 0353bb0 + 7880615 commit 73c3837
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ stages:

jobs:
fast_finish: true
allow_failures:
- stage: Vagrant
env: VIRTUAL_BOX_VERSION=6.1

include:
- &PHP
Expand Down Expand Up @@ -77,17 +74,17 @@ jobs:
- wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
- wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
# Add Oracle VirtualBox repository
- sudo add-apt-repository "deb https://download.virtualbox.org/virtualbox/debian xenial contrib"
- sudo add-apt-repository "deb https://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib"
# Add Vagrant PPA (unofficial)
- sudo add-apt-repository -y ppa:tiagohillebrandt/vagrant
# Update apt-get
- sudo apt-get update -qq
# Install Linux headers
- sudo apt-get -y --force-yes install linux-headers-`uname -r`
# Install VirtualBox
- sudo apt-get install virtualbox-${VIRTUAL_BOX_VERSION}
# Install Vagrant
# Todo: install from a package repository, not from a hardcoded URL.s
- curl -O https://releases.hashicorp.com/vagrant/2.2.6/vagrant_2.2.6_x86_64.deb
- sudo dpkg -i vagrant_2.2.6_x86_64.deb
- sudo apt-get install vagrant

install:
- composer install --no-interaction --no-progress --no-suggest --prefer-dist --optimize-autoloader --no-dev
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Draft Environment 3.x.x (unreleased)

Updates:

- [GH-157](https://github.com/lemberg/draft-environment/issues/157) - Switched to unofficial PPA for Vagrant on Travis; Vagrant 2.2.7 supports VirtualBox 6.1.x

## Draft Environment 3.0.0-rc2, 2020-02-12

New features:
Expand Down

0 comments on commit 73c3837

Please sign in to comment.