Skip to content

Commit

Permalink
Merge pull request #422 from openxc/vagrantubuntu18
Browse files Browse the repository at this point in the history
Vagrantubuntu18
  • Loading branch information
pjt0620 committed Dec 3, 2019
2 parents 4ed6bae + ca52c44 commit 776b075
Show file tree
Hide file tree
Showing 7 changed files with 412 additions and 412 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#keep Ubuntu 16.04 on Travis to match Vagrant
language: c
dist: xenial
compiler:
Expand All @@ -8,6 +7,14 @@ install:
- gem install coveralls-lcov
before_install:
- sudo apt-get update -qq
- sudo add-apt-repository ppa:deadsnakes/ppa -y
- sudo apt-get update -qq
- sudo apt-get install python3.6 -y
- sudo rm /usr/bin/python3
- sudo ln -s /usr/bin/python3.6 /usr/bin/python3
- wget https://bootstrap.pypa.io/get-pip.py
- sudo python3 get-pip.py
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq -y libsubunit-dev; fi
- travis_wait script/bootstrap.sh
- cd src
after_success:
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# vagrantup.com.

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "ubuntu/xenial64"
config.vm.box = "bento/ubuntu-18.04"

# Check for proxy enviroment variable and set it
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
Expand Down
Loading

0 comments on commit 776b075

Please sign in to comment.