Skip to content

Commit

Permalink
Merge pull request #61 from petergoldstein/feature/travis_update
Browse files Browse the repository at this point in the history
Travis Update
  • Loading branch information
indirect committed Dec 27, 2013
2 parents 8dd7879 + 7bfa1f4 commit 5cf6583
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 31 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
@@ -1,16 +1,14 @@
language: ruby
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- 2.0.0
- 2.1.0
- jruby-19mode
- rbx
gemfile:
- gemfiles/rails_3_1.gemfile
- gemfiles/rails_3_2.gemfile
- gemfiles/rails_4_0.gemfile
- gemfiles/rails_4_1.gemfile
matrix:
exclude:
- rvm: 1.8.7
gemfile: gemfiles/rails_4_0.gemfile
- rvm: 1.9.2
gemfile: gemfiles/rails_4_0.gemfile
- rvm: 1.9.3
gemfile: gemfiles/rails_4_1.gemfile
16 changes: 9 additions & 7 deletions Appraisals
@@ -1,11 +1,13 @@
appraise "rails_3_1" do
gem "rails", "~> 3.1.0"
end
appraise "rails_4_0" do
gem "rails", "~> 4.0.1"

appraise "rails_3_2" do
gem "rails", "~> 3.2.0"
gem 'rubysl', '~> 2.0', platforms: :rbx
gem 'minitest', platforms: :rbx
end

appraise "rails_4_0" do
gem "rails", "~> 4.0.1"
appraise "rails_4_1" do
gem "rails", "4.1.0.beta1"

gem 'rubysl', '~> 2.0', platforms: :rbx
gem 'minitest', platforms: :rbx
end
3 changes: 3 additions & 0 deletions Gemfile
Expand Up @@ -2,3 +2,6 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in haml-rails.gemspec
gemspec

gem 'rubysl', '~> 2.0', platforms: :rbx
gem 'minitest', platforms: :rbx
7 changes: 0 additions & 7 deletions gemfiles/rails_3_1.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails_3_2.gemfile

This file was deleted.

5 changes: 4 additions & 1 deletion gemfiles/rails_4_0.gemfile
Expand Up @@ -4,4 +4,7 @@ source "https://rubygems.org"

gem "rails", "~> 4.0.1"

gemspec :path=>"../"
gem 'rubysl', '~> 2.0', platforms: :rbx
gem 'minitest', platforms: :rbx

gemspec :path=>"../"
10 changes: 10 additions & 0 deletions gemfiles/rails_4_1.gemfile
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "4.1.0.beta1"

gem 'rubysl', '~> 2.0', platforms: :rbx
gem 'minitest', platforms: :rbx

gemspec :path=>"../"
2 changes: 1 addition & 1 deletion test/test_helper.rb
@@ -1,5 +1,5 @@
require 'rubygems'
require 'test/unit'
require 'minitest/autorun'
require 'rails/all'
require 'rails/generators'
require 'rails/generators/test_case'
Expand Down

0 comments on commit 5cf6583

Please sign in to comment.