Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ '2.6', '2.7', '3.0', '3.1', 'jruby-9.3' ]
ruby: [ '3.2', '3.3', '3.4', 'jruby-9.4', 'jruby-10' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Increase system limits
run: |
sudo swapoff -a
Expand All @@ -26,7 +26,8 @@ jobs:
sudo sysctl -w vm.max_map_count=262144
- uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 8.0.0-SNAPSHOT
stack-version: 9.0.0-SNAPSHOT
security-enabled: false
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
Expand Down
14 changes: 1 addition & 13 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,11 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in elasticsearch-dsl.gemspec
gemspec

if File.exist? File.expand_path('../../elasticsearch/elasticsearch.gemspec', __FILE__)
gem 'elasticsearch', path: File.expand_path('../../elasticsearch', __FILE__), require: false
end

if File.exist? File.expand_path('../../elasticsearch-transport', __FILE__)
gem 'elasticsearch-transport', path: File.expand_path('../../elasticsearch-transport', __FILE__), require: true
end

if File.exist? File.expand_path('../../elasticsearch-api', __FILE__)
gem 'elasticsearch-api', path: File.expand_path('../../elasticsearch-api', __FILE__), require: false
end

group :development do
gem 'rspec'
if defined?(JRUBY_VERSION)
gem 'pry-nav'
else
gem 'pry-byebug'
gem 'debug'
end
end
2 changes: 1 addition & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

require 'minitest/autorun'
require 'shoulda-context'
require 'mocha/setup'
require 'mocha/minitest'

require 'minitest/reporters'
Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
Expand Down