Merge remote-tracking branch 'origin/master' into fix-configure-handling-in-regexp-preview

* origin/master:
  Try to fix bundle install on Travis
  Always use latest td-agent on Travis
This commit is contained in:
uu59 2016-03-09 15:18:05 +09:00
commit f2d1df8685

View File

@ -3,6 +3,7 @@ rvm: 2.1.3
sudo: required
install:
- wget http://packages.treasuredata.com.s3.amazonaws.com/2/ubuntu/precise/pool/contrib/t/td-agent/td-agent_2.2.0-0_amd64.deb
- sudo dpkg -i td-agent_2.2.0-0_amd64.deb
- bundle -v
- gem i bundler
- sudo sh -c 'curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-precise-td-agent2.sh | sh'
- bundle install --jobs=4 --retry=4