Skip to content

Commit

Permalink
[CI] Updates GitHub Actions for JRuby, names
Browse files Browse the repository at this point in the history
  • Loading branch information
picandocodigo committed Apr 15, 2024
1 parent ddfde7a commit 9f31bfb
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/jruby.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
name: JRuby
name: JRuby tests
on:
push:
branches:
- main
- 8.x
pull_request:
branches:
- main
- 8.x
workflow_dispatch:
branches:
- '*'
jobs:
tests:
env:
TEST_ES_SERVER: http://localhost:9200
RAILS_VERSIONS: '5.0,6.0'
RAILS_VERSIONS: ${{ matrix.rails }}
strategy:
fail-fast: false
matrix:
rails: [ '6.1', '7.0', '7.1' ]
ruby: ['jruby-9.4']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Increase system limits
run: |
sudo swapoff -a
Expand All @@ -27,13 +30,14 @@ jobs:
sudo sysctl -w vm.max_map_count=262144
- uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 7.x-SNAPSHOT
stack-version: 8.14.0-SNAPSHOT
security-enabled: false
- uses: ruby/setup-ruby@v1
with:
ruby-version: jruby-9.3
ruby-version: ${{ matrix.ruby }}
- name: Bundle
run: |
sudo apt-get install libsqlite3-dev
sudo apt-get install libsqlite3-dev libcurl4-openssl-dev
gem install bundler
bundle install
bundle exec rake bundle:clean
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ruby 3.0
name: Ruby tests
on:
push:
branches:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem 'pry'
gem 'rake', '~> 12'

group :development do
gem 'debug'
gem 'debug' unless defined?(JRUBY_VERSION)
gem 'rspec'
gem 'yard'
end
2 changes: 1 addition & 1 deletion elasticsearch-model/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source 'https://rubygems.org'
gemspec

group :development, :testing do
gem 'debug'
gem 'debug' unless defined?(JRUBY_VERSION)
gem 'pry-nav'
gem 'rspec'
end
2 changes: 1 addition & 1 deletion elasticsearch-persistence/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ gem 'elasticsearch-model',
require: false

group :development, :testing do
gem 'debug'
gem 'debug' unless defined?(JRUBY_VERSION)
gem 'pry-nav'
gem 'rspec'
end
6 changes: 4 additions & 2 deletions elasticsearch-rails/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ gem 'elasticsearch-persistence',
require: false

group :development, :testing do
gem 'debug'
gem 'pry-nav'
gem 'rspec'
gem 'sqlite3' unless defined?(JRUBY_VERSION)
unless defined?(JRUBY_VERSION)
gem 'sqlite3'
gem 'debug'
end
end

0 comments on commit 9f31bfb

Please sign in to comment.