From 33be9c68ca5a90b06ac62659ed67192d057bc6bf Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Wed, 2 Jul 2025 11:02:36 +0100
Subject: [PATCH 1/2] [CI] Updates dependencies, Ruby versions

---
 .github/workflows/main.yml |  4 ++--
 Gemfile                    | 14 +-------------
 test/test_helper.rb        |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0b6d199..0a1f6b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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
diff --git a/Gemfile b/Gemfile
index 8d886b3..330a458 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6f1019a..454d28f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -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

From 05bb4f4505149263152fa3f074c7f7683dd7b426 Mon Sep 17 00:00:00 2001
From: Fernando Briano <fernando@picandocodigo.net>
Date: Wed, 2 Jul 2025 11:06:54 +0100
Subject: [PATCH 2/2] [CI] Sets STACK_VERSION to latest, security disabled

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0a1f6b9..eecb419 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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 }}