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
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
env:
RUBY_VERSION: "{{ matrix.ruby }}"
TEST_SUITE: "{{ matrix.suite }}"
STACK_VERSION: 8.16.3-SNAPSHOT
STACK_VERSION: 8.16.5-SNAPSHOT
TRANSPORT_VERSION: "{{ matrix.transport }}"
RUBY_SOURCE: "{{ matrix.ruby_source }}"
QUIET: false
Expand Down Expand Up @@ -62,7 +62,7 @@ steps:
provider: "gcp"
env:
RUBY_VERSION: "3.3"
STACK_VERSION: 8.16.3-SNAPSHOT
STACK_VERSION: 8.16.5-SNAPSHOT
ES_YAML_TESTS_BRANCH: 8.16
TRANSPORT_VERSION: "8.3"
RUBY_SOURCE: "ruby"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/8.16.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
sudo sysctl -w vm.max_map_count=262144
- uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 8.16.3-SNAPSHOT
stack-version: 8.16.5-SNAPSHOT
security-enabled: false
- uses: ruby/setup-ruby@v1
with:
Expand All @@ -40,4 +40,4 @@ jobs:
- name: elasticsearch
run: cd elasticsearch && bundle exec rake test:all
- name: elasticsearch-api
run: rake es:download_artifacts[8.16.3-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
run: rake es:download_artifacts[8.16.5-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
4 changes: 2 additions & 2 deletions .github/workflows/otel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
sudo sysctl -w vm.max_map_count=262144
- uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 8.16.3-SNAPSHOT
stack-version: 8.16.5-SNAPSHOT
security-enabled: false
- uses: ruby/setup-ruby@v1
with:
Expand All @@ -42,4 +42,4 @@ jobs:
- name: elasticsearch
run: cd elasticsearch && bundle exec rake test:all
- name: elasticsearch-api
run: rake es:download_artifacts[8.16.3-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
run: rake es:download_artifacts[8.16.5-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
11 changes: 3 additions & 8 deletions elasticsearch-api/elasticsearch-api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,10 @@ Gem::Specification.new do |s|
s.add_development_dependency 'yard'

# Gems for testing integrations
s.add_development_dependency 'jsonify'
s.add_development_dependency 'activesupport'
s.add_development_dependency 'hashie'
# Temporary support for Ruby 2.6, since it's EOL March 2022:
if RUBY_VERSION < '2.7.0'
s.add_development_dependency 'jbuilder', '< 7.0.0'
else
s.add_development_dependency 'activesupport'
s.add_development_dependency 'jbuilder'
end
s.add_development_dependency 'jbuilder'
s.add_development_dependency 'jsonify'

s.add_development_dependency 'cane'
s.add_development_dependency 'escape_utils' unless defined? JRUBY_VERSION
Expand Down
7 changes: 4 additions & 3 deletions elasticsearch-api/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
require 'debug'
end
require 'yaml'
require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
# Require logger before jbuilder to avoid concurrent-ruby error uninitialized constant
# ActiveSupport::LoggerThreadSafeLevel::Logger. Dependencies are fun.
require 'logger'
require 'jbuilder'
require 'jsonify'
require 'elasticsearch'
require 'elasticsearch-api'
require 'openssl'
require 'logger'

tracer = ::Logger.new(STDERR)
tracer = ::Logger.new($stderr)
tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| ' ' + n } }\n" }

module HelperModule
Expand Down