Skip to content

Commit

Permalink
Fix travis build
Browse files Browse the repository at this point in the history
* Ruby 1.9 is no longer necessary as lon as Vagrant 1.4 comes with ruby 2.0
* Fix Bundler version to the latest version < 1.7
* Update compatibility matrix
  • Loading branch information
ggiamarchi committed Sep 24, 2014
1 parent 8c4dc81 commit 104a1da
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 71 deletions.
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.0.0
- 2.1.0
before_install:
- cd source
- gem install bundler -v 1.6.6
- cd source
install:
- travis_retry bundle install --without debug
- travis_retry bundle _1.6.6_ install --without debug
script:
- bundle exec rake
- bundle _1.6.6_ exec rake
gemfile:
- gemfiles/minimal_release.gemfile
- gemfiles/previous_release.gemfile
- gemfiles/latest_stable.gemfile
13 changes: 0 additions & 13 deletions source/Appraisals

This file was deleted.

22 changes: 6 additions & 16 deletions source/gemfiles/latest_stable.gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
# This file was generated by Appraisal
source 'https://rubygems.org'

source "https://rubygems.org"

gem "appraisal", "1.0.0"
gem "restclient", "0.10.0"
gem "terminal-table", "1.4.5"
gem "webmock", "~> 1.18.0", :group => [:test]
gem "rubocop", "0.23.0", :require => false
gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
gem "fakefs", "~> 0.5.2", :group => [:test]
gem "sshkey", "~> 1.6.1"
gem "colorize", "~> 0.7.3"
gemspec :path => "../"

group :development do
gem "coveralls", :require => false
gem "debugger"
gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.5'
gem 'appraisal', '1.0.0'
gem 'rubocop', '0.23.0', require: false
gem 'coveralls', require: false
end

gemspec :path => "../"
10 changes: 10 additions & 0 deletions source/gemfiles/minimal_release.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source 'https://rubygems.org'

gemspec :path => "../"

group :development do
gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.4.0'
gem 'appraisal', '1.0.0'
gem 'rubocop', '0.23.0', require: false
gem 'coveralls', require: false
end
20 changes: 0 additions & 20 deletions source/gemfiles/oldest_current.gemfile

This file was deleted.

22 changes: 6 additions & 16 deletions source/gemfiles/previous_release.gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
# This file was generated by Appraisal
source 'https://rubygems.org'

source "https://rubygems.org"

gem "appraisal", "1.0.0"
gem "restclient", "0.10.0"
gem "terminal-table", "1.4.5"
gem "webmock", "~> 1.18.0", :group => [:test]
gem "rubocop", "0.23.0", :require => false
gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
gem "fakefs", "~> 0.5.2", :group => [:test]
gem "sshkey", "~> 1.6.1"
gem "colorize", "~> 0.7.3"
gemspec :path => "../"

group :development do
gem "coveralls", :require => false
gem "debugger"
gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.5.4'
gem 'appraisal', '1.0.0'
gem 'rubocop', '0.23.0', require: false
gem 'coveralls', require: false
end

gemspec :path => "../"

0 comments on commit 104a1da

Please sign in to comment.