Skip to content

[CI] Updates: drop Ruby 3.1 (eol) adds Ruby and JRuby head #2630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2025
Merged

[CI] Updates: drop Ruby 3.1 (eol) adds Ruby and JRuby head #2630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8f011a
[CI] Updates: drop Ruby 3.1 (eol) adds Ruby and JRuby head
picandocodigo Apr 10, 2025
2bb5e81
Adds 'ostruct' as a development dependency
picandocodigo Apr 10, 2025
8570a26
[Tests] Updates perform_request_spec
picandocodigo Apr 10, 2025
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: 1 addition & 6 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ steps:
- "3.4"
- "3.3"
- "3.2"
- "3.1"
ruby_source:
- "ruby"
transport:
Expand All @@ -17,16 +16,12 @@ steps:
- with: # JRuby tests
ruby: "9.4"
ruby_source: "jruby"
transport: "8.3"
transport: "8.4"
# Test for different versions of transport
- with:
ruby: "3.4"
ruby_source: "ruby"
transport: "main"
- with:
ruby: "3.4"
ruby_source: "ruby"
transport: "8.2"
env:
RUBY_VERSION: "{{ matrix.ruby }}"
STACK_VERSION: 9.1.0-SNAPSHOT
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4']
ruby: ['head', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4', 'jruby-head']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 4 additions & 1 deletion elasticsearch-api/spec/unit/perform_request_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
spec.visibility != 'public' ||
# TODO: Once the test suite is migrated to elasticsearch-specification, these should be removed
spec.module_namespace.flatten.first == 'rollup' ||
['scroll', 'clear_scroll', 'connector.last_sync', 'inference.put_eis'].include?(spec.endpoint_name)
[
'scroll', 'clear_scroll', 'connector.last_sync', 'inference.put_eis', 'esql.get_query',
'esql.list_queries'
].include?(spec.endpoint_name)

# These are the path parts defined by the user in the method argument
defined_path_parts = spec.path_params.inject({}) do |params, part|
Expand Down
1 change: 1 addition & 0 deletions elasticsearch/elasticsearch.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'base64'
s.add_development_dependency 'bundler'
s.add_development_dependency 'debug' unless defined?(JRUBY_VERSION)
s.add_development_dependency 'ostruct'
s.add_development_dependency 'pry'
s.add_development_dependency 'rake'
s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
Expand Down