Skip to content

Commit 5352f87

Browse files
committed
[CI] Updates Gemfiles
1 parent 33d0bd4 commit 5352f87

File tree

7 files changed

+20
-60
lines changed

7 files changed

+20
-60
lines changed

.github/workflows/7x_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
tests:
1414
env:
1515
TEST_ES_SERVER: http://localhost:9200
16-
RAILS_VERSIONS: '5.0,6.0'
16+
RAILS_VERSIONS: '6.0,7.0'
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ruby: ['2.6', '2.7', '3.0']
20+
ruby: ['2.7', '3.0']
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v4

elasticsearch-model/Rakefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ desc 'Run unit tests'
2121
task default: 'test:all'
2222
task test: 'test:all'
2323

24-
gemfiles = ['5.0.gemfile', '6.0.gemfile']
25-
gemfiles << '4.0.gemfile' if RUBY_VERSION < '2.7'
24+
gemfiles = ['6.0.gemfile', '7.0.gemfile']
2625
GEMFILES = gemfiles.freeze
2726

2827
namespace :bundle do

elasticsearch-model/gemfiles/4.0.gemfile

-36
This file was deleted.

elasticsearch-model/gemfiles/6.0.gemfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ source 'https://rubygems.org'
2424

2525
gemspec path: '../'
2626

27-
gem 'activemodel', '6.0.0'
28-
gem 'activerecord', '6.0.0'
29-
gem 'sqlite3' unless defined?(JRUBY_VERSION)
30-
# gem 'mongoid', '~> 6'
27+
gem 'activemodel', '6.0'
28+
gem 'activerecord', '6.0'
29+
gem 'activesupport', '6.0'
3130

3231
group :development, :testing do
3332
gem 'pry-nav'

elasticsearch-model/gemfiles/5.0.gemfile elasticsearch-model/gemfiles/7.0.gemfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717

1818
# Usage:
1919
#
20-
# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle install
21-
# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle exec rake test:integration
20+
# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
21+
# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
2222

2323
source 'https://rubygems.org'
2424

2525
gemspec path: '../'
2626

27-
gem 'activemodel', '~> 5'
28-
gem 'activerecord', '~> 5'
29-
gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
30-
gem 'mongoid', '~> 6'
27+
gem 'activemodel', '7.0'
28+
gem 'activerecord', '7.0'
29+
gem 'activesupport', '7.0'
3130

3231
group :development, :testing do
33-
gem 'rspec'
3432
gem 'pry-nav'
33+
gem 'rspec'
3534
end

elasticsearch-model/gemfiles/3.0.gemfile elasticsearch-model/gemfiles/7.1.gemfile

+7-8
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717

1818
# Usage:
1919
#
20-
# $ BUNDLE_GEMFILE=./gemfiles/3.0.gemfile bundle install
21-
# $ BUNDLE_GEMFILE=./gemfiles/3.0.gemfile bundle exec rake test:integration
20+
# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
21+
# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
2222

2323
source 'https://rubygems.org'
2424

2525
gemspec path: '../'
2626

27-
gem 'activemodel', '>= 3.0'
28-
gem 'activerecord', '~> 3.2'
29-
gem 'mongoid', '>= 3.0'
30-
gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
27+
gem 'activemodel', '7.1'
28+
gem 'activerecord', '7.1'
29+
gem 'activesupport', '7.1'
3130

3231
group :development, :testing do
33-
gem 'rspec'
3432
gem 'pry-nav'
35-
end
33+
gem 'rspec'
34+
end

elasticsearch-rails/spec/instrumentation/log_subscriber_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454
end
5555
end
5656
end
57-
end
57+
end if version >= Gem::Version.new('7.1')

0 commit comments

Comments
 (0)