Skip to content

Commit 06e598b

Browse files
committed
Update versions in travis
1 parent 7bbe7ec commit 06e598b

File tree

3 files changed

+40
-8
lines changed

3 files changed

+40
-8
lines changed

.travis.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,40 @@ branches:
1717
- travis
1818
- 5.x
1919
- 6.x
20-
- 2.x
2120

2221
matrix:
2322
include:
24-
- rvm: 2.2
23+
- rvm: 2.2.10
2524
jdk: oraclejdk8
26-
env: RAILS_VERSIONS=3.0
25+
env: RAILS_VERSIONS=3.0,4.0
2726

2827
- rvm: 2.3.8
2928
jdk: oraclejdk8
30-
env: RAILS_VERSIONS=5.0
29+
env: RAILS_VERSIONS=4.0,5.0
3130

32-
- rvm: 2.6.1
31+
- rvm: 2.4.8
3332
jdk: oraclejdk8
3433
env: RAILS_VERSIONS=4.0,5.0
3534

35+
- rvm: 2.5.7
36+
jdk: oraclejdk8
37+
env: RAILS_VERSIONS=4.0,5.0,6.0
38+
39+
- rvm: 2.6.5
40+
jdk: oraclejdk8
41+
env: RAILS_VERSIONS=4.0,5.0,6.0
42+
43+
- rvm: 2.7.0
44+
jdk: oraclejdk8
45+
env: RAILS_VERSIONS=5.0,6.0
46+
3647
- rvm: jruby-9.2.5.0
3748
jdk: oraclejdk8
3849
env: RAILS_VERSIONS=5.0
3950

4051
env:
4152
global:
42-
- ELASTICSEARCH_VERSION=6.4.0
53+
- ELASTICSEARCH_VERSION=6.8.6
4354
- QUIET=true
4455

4556

@@ -48,8 +59,11 @@ before_install:
4859
- wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.deb.sha512
4960
- shasum -a 512 -c elasticsearch-${ELASTICSEARCH_VERSION}.deb.sha512
5061
- sudo dpkg -i --force-confnew elasticsearch-${ELASTICSEARCH_VERSION}.deb
62+
- sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
5163
- sudo service elasticsearch start
52-
- gem update --system
64+
- if [ $TRAVIS_RUBY_VERSION != "2.2.10" ]; then
65+
gem update --system;
66+
fi
5367
- gem update bundler
5468
- gem --version
5569
- bundle version

elasticsearch-model/gemfiles/5.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gemspec path: '../'
1010
gem 'activemodel', '~> 5'
1111
gem 'activerecord', '~> 5'
1212
gem 'sqlite3' unless defined?(JRUBY_VERSION)
13-
gem 'mongoid', '~> 6'
13+
gem 'mongoid', '~> 6.4'
1414

1515
group :development, :testing do
1616
gem 'rspec'
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Usage:
2+
#
3+
# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
4+
# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
5+
6+
source 'https://rubygems.org'
7+
8+
gemspec path: '../'
9+
10+
gem 'activemodel', '~> 6'
11+
gem 'activerecord', '~> 6'
12+
gem 'sqlite3' unless defined?(JRUBY_VERSION)
13+
gem 'mongoid', '~> 7'
14+
15+
group :development, :testing do
16+
gem 'rspec'
17+
gem 'pry-nav'
18+
end

0 commit comments

Comments
 (0)