From e7e03574daa94d9d460768b2fc00cfb2a9812ce2 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Fri, 17 Jan 2025 10:10:31 +0000 Subject: [PATCH 1/3] [CI] Fixes rake task for automated matrix version bumping --- rake_tasks/automation.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rake_tasks/automation.rake b/rake_tasks/automation.rake index 751804e492..43babd85b7 100644 --- a/rake_tasks/automation.rake +++ b/rake_tasks/automation.rake @@ -105,8 +105,8 @@ namespace :automation do if file == '.buildkite/pipeline.yml' require 'yaml' yaml = YAML.safe_load(content) - branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1] - yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH'] + branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1].to_s + yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH'].to_s unless ['main', '8.x'].include? yaml_tests_branch content.gsub!(yaml_tests_branch, branch) puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}" From 091bf54b68ec48dba96f6c2b48844a49c31d66cf Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Fri, 17 Jan 2025 10:11:02 +0000 Subject: [PATCH 2/3] [CI] Bumps stack version to 8.17.1-SNAPSHOT in test matrices --- .buildkite/pipeline.yml | 4 ++-- .github/workflows/8.17.yml | 4 ++-- .github/workflows/otel.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 1269d70433..6959d44693 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,7 +5,7 @@ steps: env: RUBY_VERSION: "{{ matrix.ruby }}" TEST_SUITE: "{{ matrix.suite }}" - STACK_VERSION: 8.17.0-SNAPSHOT + STACK_VERSION: 8.17.1-SNAPSHOT TRANSPORT_VERSION: "{{ matrix.transport }}" RUBY_SOURCE: "{{ matrix.ruby_source }}" QUIET: false @@ -62,7 +62,7 @@ steps: provider: "gcp" env: RUBY_VERSION: "3.3" - STACK_VERSION: 8.17.0-SNAPSHOT + STACK_VERSION: 8.17.1-SNAPSHOT ES_YAML_TESTS_BRANCH: 8.17 TRANSPORT_VERSION: "8.3" RUBY_SOURCE: "ruby" diff --git a/.github/workflows/8.17.yml b/.github/workflows/8.17.yml index 428562969e..dfa7450457 100644 --- a/.github/workflows/8.17.yml +++ b/.github/workflows/8.17.yml @@ -26,7 +26,7 @@ jobs: sudo sysctl -w vm.max_map_count=262144 - uses: elastic/elastic-github-actions/elasticsearch@master with: - stack-version: 8.17.0-SNAPSHOT + stack-version: 8.17.1-SNAPSHOT security-enabled: false - uses: ruby/setup-ruby@v1 with: @@ -40,4 +40,4 @@ jobs: - name: elasticsearch run: cd elasticsearch && bundle exec rake test:all - name: elasticsearch-api - run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit + run: rake es:download_artifacts[8.17.1-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit diff --git a/.github/workflows/otel.yml b/.github/workflows/otel.yml index 95158d19b2..d99a27ead6 100644 --- a/.github/workflows/otel.yml +++ b/.github/workflows/otel.yml @@ -28,7 +28,7 @@ jobs: sudo sysctl -w vm.max_map_count=262144 - uses: elastic/elastic-github-actions/elasticsearch@master with: - stack-version: 8.17.0-SNAPSHOT + stack-version: 8.17.1-SNAPSHOT security-enabled: false - uses: ruby/setup-ruby@v1 with: @@ -42,4 +42,4 @@ jobs: - name: elasticsearch run: cd elasticsearch && bundle exec rake test:all - name: elasticsearch-api - run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit + run: rake es:download_artifacts[8.17.1-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit From e13460d589b9b154d6de428d97b07614bd84eb6b Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Thu, 16 Jan 2025 14:20:30 +0000 Subject: [PATCH 3/3] [Gem] Lock concurrent-ruby for JRuby 9.3 --- elasticsearch-api/elasticsearch-api.gemspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elasticsearch-api/elasticsearch-api.gemspec b/elasticsearch-api/elasticsearch-api.gemspec index a458ed60d1..ebc59fcf0d 100644 --- a/elasticsearch-api/elasticsearch-api.gemspec +++ b/elasticsearch-api/elasticsearch-api.gemspec @@ -49,7 +49,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'ansi' s.add_development_dependency 'bundler' s.add_development_dependency 'elasticsearch' - s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= "9.4" + s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= '9.4' s.add_development_dependency 'minitest' s.add_development_dependency 'minitest-reporters', '>= 1.6' s.add_development_dependency 'mocha' @@ -59,6 +59,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'yard' # Gems for testing integrations + s.add_development_dependency 'concurrent-ruby', '1.3.4' if defined? JRUBY_VERSION && JRUBY_VERSION < '9.4' s.add_development_dependency 'jsonify' s.add_development_dependency 'hashie' # Temporary support for Ruby 2.6, since it's EOL March 2022: