Skip to content

Commit a579b92

Browse files
Merge pull request #101 from elight/feature/add_rails_5_to_travis
Add a Rails 5 Gemfile and run in Travis
2 parents 21abf1b + 8f235ba commit a579b92

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

Diff for: .travis.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
before_install:
22
- gem update bundler
33
gemfile:
4-
- gemfiles/Gemfile.rails-4.0
5-
- gemfiles/Gemfile.rails-4.1
4+
- gemfiles/Gemfile.rails-5.0
65
- gemfiles/Gemfile.rails-4.2
6+
- gemfiles/Gemfile.rails-4.1
7+
- gemfiles/Gemfile.rails-4.0
78
rvm:
89
- 2.3.0
910
- 2.2.3
@@ -13,6 +14,17 @@ rvm:
1314
- jruby-19mode
1415
- rbx-2
1516
matrix:
17+
exclude:
18+
- gemfile: gemfiles/Gemfile.rails-5.0
19+
rvm: rbx-2
20+
- gemfile: gemfiles/Gemfile.rails-5.0
21+
rvm: jruby-19mode
22+
- gemfile: gemfiles/Gemfile.rails-5.0
23+
rvm: 1.9.3
24+
- gemfile: gemfiles/Gemfile.rails-5.0
25+
rvm: 2.0.0
26+
- gemfile: gemfiles/Gemfile.rails-5.0
27+
rvm: 2.1.0
1628
allow_failures:
1729
- rvm: rbx-2
1830
- gemfile: gemfiles/Gemfile.rails-4.1

Diff for: gemfiles/Gemfile.rails-5.0

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '..'
4+
5+
group :development do
6+
gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
7+
gem 'sqlite3', platforms: :ruby
8+
gem 'rails', '~> 5.0.0.beta1'
9+
end

0 commit comments

Comments
 (0)