Skip to content

Commit 7d10639

Browse files
authored
Merge pull request #178 from yahonda/ci_against_rails60
CI against Rails 6.0
2 parents cd5845c + 6b41521 commit 7d10639

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,16 @@ gemfile:
4242
- gemfiles/Gemfile.activerecord-5.0
4343
- gemfiles/Gemfile.activerecord-5.1
4444
- gemfiles/Gemfile.activerecord-5.2
45+
- gemfiles/Gemfile.activerecord-6.0
4546

4647
matrix:
48+
exclude:
49+
- gemfile: gemfiles/Gemfile.activerecord-6.0
50+
rvm: 2.4.6
51+
- gemfile: gemfiles/Gemfile.activerecord-6.0
52+
rvm: 2.3.8
53+
- gemfile: gemfiles/Gemfile.activerecord-6.0
54+
rvm: 2.2.10
4755
allow_failures:
4856
- rvm: ruby-head
4957
- rvm: jruby-head

gemfiles/Gemfile.activerecord-6.0

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
source 'http://rubygems.org'
2+
3+
group :development do
4+
gem 'juwelier', '~> 2.0'
5+
gem 'rspec_junit_formatter'
6+
end
7+
8+
group :test, :development do
9+
gem 'rake', '>= 10.0'
10+
gem 'rspec', '~> 3.1'
11+
12+
unless ENV['NO_ACTIVERECORD']
13+
gem 'activerecord', '~> 6.0.0.rc1'
14+
gem 'activerecord-oracle_enhanced-adapter', '~>6.0.0.rc1'
15+
gem 'simplecov', '>= 0'
16+
end
17+
18+
platforms :ruby, :mswin, :mingw do
19+
gem 'ruby-oci8', '~> 2.1'
20+
end
21+
end

0 commit comments

Comments
 (0)