Skip to content

Commit e40cb7b

Browse files
committed
Updates Ruby, Rails, Stack versions for tests
1 parent 98c5fa1 commit e40cb7b

File tree

4 files changed

+40
-5
lines changed

4 files changed

+40
-5
lines changed

.github/workflows/3.0.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
rails: [ '6.1', '7.0' ]
17+
rails: [ '6.1', '7.0', '7.1' ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v2
@@ -26,11 +26,11 @@ jobs:
2626
sudo sysctl -w vm.max_map_count=262144
2727
- uses: elastic/elastic-github-actions/elasticsearch@master
2828
with:
29-
stack-version: 8.11.0-SNAPSHOT
29+
stack-version: 8.13-SNAPSHOT
3030
security-enabled: false
3131
- uses: ruby/setup-ruby@v1
3232
with:
33-
ruby-version: 3.0
33+
ruby-version: 3.3
3434
- name: Bundle
3535
run: |
3636
sudo apt-get install libsqlite3-dev
+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Licensed to Elasticsearch B.V. under one or more contributor
2+
# license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright
4+
# ownership. Elasticsearch B.V. licenses this file to you under
5+
# the Apache License, Version 2.0 (the "License"); you may
6+
# not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# Usage:
19+
#
20+
# $ BUNDLE_GEMFILE=./gemfiles/7.0.gemfile bundle install
21+
# $ BUNDLE_GEMFILE=./gemfiles/7.0.gemfile bundle exec rake test:integration
22+
23+
source 'https://rubygems.org'
24+
25+
gemspec path: '../'
26+
27+
gem 'activemodel', '~> 7.1'
28+
gem 'activerecord', '~> 7.1'
29+
gem 'sqlite3' unless defined?(JRUBY_VERSION)
30+
# gem 'mongoid', '~> 6'
31+
32+
group :development, :testing do
33+
gem 'debug'
34+
gem 'pry-nav'
35+
gem 'rspec'
36+
end

elasticsearch-model/lib/elasticsearch/model/multimodel.rb

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
module Elasticsearch
1919
module Model
20-
2120
# Keeps a global registry of classes that include `Elasticsearch::Model`
2221
#
2322
class Registry

elasticsearch-model/lib/elasticsearch/model/naming.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
module Elasticsearch
1919
module Model
20-
# Provides methods for getting and setting index name the model
20+
# Provides methods for getting and setting index and name for the model
2121
#
2222
module Naming
2323
module ClassMethods

0 commit comments

Comments
 (0)