[CI] Updates GitHub Actions

.github/workflows/2.6.yml → .github/workflows/7x_tests.yml

@@ -1,11 +1,11 @@
-name: Ruby 2.6
+name: 7x tests
 on:
   push:
     branches:
-      - main
+      - 7.x
   pull_request:
     branches:
-      - main
+      - 7.x
   workflow_dispatch:
     branches:
       - '*'
@@ -16,9 +16,11 @@ jobs:
       RAILS_VERSIONS: '5.0,6.0'
     strategy:
       fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0' ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Increase system limits
       run: |
         sudo swapoff -a
@@ -30,11 +32,11 @@ jobs:
         stack-version: 7.x-SNAPSHOT
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: ${{ matrix.ruby }}
     - name: Bundle
       run: |
         sudo apt-get install libsqlite3-dev
-        gem install bundler
+        gem install bundler -v 2.4.22
         bundle install
         bundle exec rake bundle:clean
         bundle exec rake bundle:install

.github/workflows/jruby.yml

@@ -2,10 +2,10 @@ name: JRuby
 on:
   push:
     branches:
-      - main
+      - 7.x
   pull_request:
     branches:
-      - main
+      - 7.x
   workflow_dispatch:
     branches:
       - '*'
@@ -16,6 +16,8 @@ jobs:
       RAILS_VERSIONS: '5.0,6.0'
     strategy:
       fail-fast: false
+      matrix:
+        ruby: [ 'jruby-9.3', 'jruby-9.4' ]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -27,13 +29,12 @@ jobs:
         sudo sysctl -w vm.max_map_count=262144
     - uses: elastic/elastic-github-actions/elasticsearch@master
       with:
-        stack-version: 7.x-SNAPSHOT
+        stack-version: 7.17-SNAPSHOT
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: jruby-9.3
+        ruby-version: ${{ matrix.ruby }}
     - name: Bundle
       run: |
-        sudo apt-get install libsqlite3-dev
         gem install bundler
         bundle install
         bundle exec rake bundle:clean

elasticsearch-model/Rakefile

@@ -52,6 +52,7 @@ namespace :test do
     puts '-' * 80
     gemfiles.each do |gemfile|
       puts "GEMFILE: #{gemfile}"
+      sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' bundle install"
       sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " \
              ' bundle exec rspec'
       puts '-' * 80

elasticsearch-model/gemfiles/5.0.gemfile

@@ -26,7 +26,7 @@ gemspec path: '../'
 
 gem 'activemodel',  '~> 5'
 gem 'activerecord', '~> 5'
-gem 'sqlite3' unless defined?(JRUBY_VERSION)
+gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
 gem 'mongoid', '~> 6'
 
 group :development, :testing do

elasticsearch-model/lib/elasticsearch/model.rb

@@ -114,6 +114,11 @@ class << self
           METHODS.each do |method|
             delegate method, to: :__elasticsearch__ unless self.public_instance_methods.include?(method)
           end
+
+          def inherited(subclass)
+            super
+            Registry.add(subclass) if subclass.is_a?(Class)
+          end
         end
       end
 

elasticsearch-model/spec/elasticsearch/model/adapters/active_record/import_spec.rb

@@ -52,6 +52,10 @@
       it 'imports all documents' do
         expect(ImportArticle.search('*').results.total).to eq(10)
       end
+
+      it "does not pollute the model's namespace" do
+        expect(ImportArticle.methods).not_to include(:__transform)
+      end
     end
 
     context 'when batch size is specified' do

elasticsearch-model/spec/spec_helper.rb

@@ -31,6 +31,10 @@
 require 'yaml'
 require 'active_record'
 
+# Load all of ActiveSupport to be sure of complete compatibility -
+# see https://github.com/elastic/elasticsearch-rails/pull/1075 for details
+require 'active_support/all'
+
 unless defined?(ELASTICSEARCH_URL)
   ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
 end