Skip to content

Commit d32af9a

Browse files
committed
[CI] Updates GitHub Actions
Lock bundler to v 2.4.22, since Ruby old :( Removes unnecessary package installation Updates STACK_VERSION Adds jruby 9.4 Run bundle install with BUNDLE_GEMFILE Updates actions/checkout sqlite for Rails 5 shenanigans
1 parent d9c494e commit d32af9a

File tree

5 files changed

+16
-58
lines changed

5 files changed

+16
-58
lines changed

.github/workflows/2.7.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/2.6.yml renamed to .github/workflows/7x_tests.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Ruby 2.6
1+
name: 7x tests
22
on:
33
push:
44
branches:
5-
- main
5+
- 7.x
66
pull_request:
77
branches:
8-
- main
8+
- 7.x
99
workflow_dispatch:
1010
branches:
1111
- '*'
@@ -16,9 +16,11 @@ jobs:
1616
RAILS_VERSIONS: '5.0,6.0'
1717
strategy:
1818
fail-fast: false
19+
matrix:
20+
ruby: [ '2.6', '2.7', '3.0' ]
1921
runs-on: ubuntu-latest
2022
steps:
21-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2224
- name: Increase system limits
2325
run: |
2426
sudo swapoff -a
@@ -30,11 +32,11 @@ jobs:
3032
stack-version: 7.x-SNAPSHOT
3133
- uses: ruby/setup-ruby@v1
3234
with:
33-
ruby-version: 2.6
35+
ruby-version: ${{ matrix.ruby }}
3436
- name: Bundle
3537
run: |
3638
sudo apt-get install libsqlite3-dev
37-
gem install bundler
39+
gem install bundler -v 2.4.22
3840
bundle install
3941
bundle exec rake bundle:clean
4042
bundle exec rake bundle:install

.github/workflows/jruby.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: JRuby
22
on:
33
push:
44
branches:
5-
- main
5+
- 7.x
66
pull_request:
77
branches:
8-
- main
8+
- 7.x
99
workflow_dispatch:
1010
branches:
1111
- '*'
@@ -16,6 +16,8 @@ jobs:
1616
RAILS_VERSIONS: '5.0,6.0'
1717
strategy:
1818
fail-fast: false
19+
matrix:
20+
ruby: [ 'jruby-9.3', 'jruby-9.4' ]
1921
runs-on: ubuntu-latest
2022
steps:
2123
- uses: actions/checkout@v2
@@ -27,13 +29,12 @@ jobs:
2729
sudo sysctl -w vm.max_map_count=262144
2830
- uses: elastic/elastic-github-actions/elasticsearch@master
2931
with:
30-
stack-version: 7.x-SNAPSHOT
32+
stack-version: 7.17-SNAPSHOT
3133
- uses: ruby/setup-ruby@v1
3234
with:
33-
ruby-version: jruby-9.3
35+
ruby-version: ${{ matrix.ruby }}
3436
- name: Bundle
3537
run: |
36-
sudo apt-get install libsqlite3-dev
3738
gem install bundler
3839
bundle install
3940
bundle exec rake bundle:clean

elasticsearch-model/Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ namespace :test do
5252
puts '-' * 80
5353
gemfiles.each do |gemfile|
5454
puts "GEMFILE: #{gemfile}"
55+
sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' bundle install"
5556
sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " \
5657
' bundle exec rspec'
5758
puts '-' * 80

elasticsearch-model/gemfiles/5.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gemspec path: '../'
2626

2727
gem 'activemodel', '~> 5'
2828
gem 'activerecord', '~> 5'
29-
gem 'sqlite3' unless defined?(JRUBY_VERSION)
29+
gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
3030
gem 'mongoid', '~> 6'
3131

3232
group :development, :testing do

0 commit comments

Comments
 (0)