Skip to content

Commit 0aedb0d

Browse files
committed
[CI] Updates GitHub Actions for JRuby, names
1 parent f9631b8 commit 0aedb0d

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

.github/workflows/jruby.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
name: JRuby
1+
name: JRuby tests
22
on:
33
push:
44
branches:
5-
- main
5+
- 8.x
66
pull_request:
77
branches:
8-
- main
8+
- 8.x
99
workflow_dispatch:
1010
branches:
1111
- '*'
1212
jobs:
1313
tests:
1414
env:
1515
TEST_ES_SERVER: http://localhost:9200
16-
RAILS_VERSIONS: '5.0,6.0'
16+
RAILS_VERSIONS: ${{ matrix.rails }}
1717
strategy:
1818
fail-fast: false
19+
matrix:
20+
rails: [ '6.1', '7.0', '7.1' ]
21+
ruby: ['jruby-9.4']
1922
runs-on: ubuntu-latest
2023
steps:
21-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2225
- name: Increase system limits
2326
run: |
2427
sudo swapoff -a
@@ -27,13 +30,14 @@ jobs:
2730
sudo sysctl -w vm.max_map_count=262144
2831
- uses: elastic/elastic-github-actions/elasticsearch@master
2932
with:
30-
stack-version: 7.x-SNAPSHOT
33+
stack-version: 8.14.0-SNAPSHOT
34+
security-enabled: false
3135
- uses: ruby/setup-ruby@v1
3236
with:
33-
ruby-version: jruby-9.3
37+
ruby-version: ${{ matrix.ruby }}
3438
- name: Bundle
3539
run: |
36-
sudo apt-get install libsqlite3-dev
40+
sudo apt-get install libsqlite3-dev libcurl4-openssl-dev
3741
gem install bundler
3842
bundle install
3943
bundle exec rake bundle:clean

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ruby 3.0
1+
name: Ruby tests
22
on:
33
push:
44
branches:

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gem 'pry'
2424
gem 'rake', '~> 12'
2525

2626
group :development do
27-
gem 'debug'
27+
gem 'debug' unless defined?(JRUBY_VERSION)
2828
gem 'rspec'
2929
gem 'yard'
3030
end

elasticsearch-model/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source 'https://rubygems.org'
2121
gemspec
2222

2323
group :development, :testing do
24-
gem 'debug'
24+
gem 'debug' unless defined?(JRUBY_VERSION)
2525
gem 'pry-nav'
2626
gem 'rspec'
2727
end

elasticsearch-persistence/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ gem 'elasticsearch-model',
2525
require: false
2626

2727
group :development, :testing do
28-
gem 'debug'
28+
gem 'debug' unless defined?(JRUBY_VERSION)
2929
gem 'pry-nav'
3030
gem 'rspec'
3131
end

elasticsearch-rails/Gemfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ gem 'elasticsearch-persistence',
2929
require: false
3030

3131
group :development, :testing do
32-
gem 'debug'
3332
gem 'pry-nav'
3433
gem 'rspec'
35-
gem 'sqlite3' unless defined?(JRUBY_VERSION)
34+
unless defined?(JRUBY_VERSION)
35+
gem 'sqlite3'
36+
gem 'debug'
37+
end
3638
end

0 commit comments

Comments
 (0)