Skip to content

Commit f0b48da

Browse files
committed
JRuby builds
1 parent f8329c9 commit f0b48da

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

ci/.github/workflows/ci.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
test:
1313
name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
14-
runs-on: ubuntu-20.04
14+
runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
1515
strategy:
1616
matrix:
1717
ruby:
@@ -28,6 +28,14 @@ jobs:
2828
-
2929
DIFF_LCS_VERSION: "> 1.4.3"
3030
include:
31+
- ruby: jruby-9.2.13.0
32+
env:
33+
JRUBY_OPTS: "--dev"
34+
- ruby: jruby-9.1.17.0
35+
bundler: 1
36+
os: ubuntu-18.04
37+
env:
38+
JRUBY_OPTS: "--dev"
3139
- ruby: 2.7
3240
name_extra: "with diff-lcs 1.3"
3341
env:
@@ -37,12 +45,12 @@ jobs:
3745
env:
3846
DIFF_LCS_VERSION: "1.4.3"
3947
fail-fast: false
40-
continue-on-error: ${{ matrix.ruby == 'jruby-9.2.13.0' || endsWith(matrix.ruby, 'head') }}
48+
continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
4149
steps:
4250
- uses: actions/checkout@v2
4351
- uses: ruby/setup-ruby@v1
4452
with:
45-
bundler: ${{ (matrix.ruby == 'jruby-9.1.17.0' && 1) || 2 }}
53+
bundler: ${{ matrix.bundler || 2 }}
4654
ruby-version: ${{ matrix.ruby }}
4755
bundler-cache: true
4856
- run: script/update_rubygems_and_install_bundler

ci/.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ rvm:
1818
- 2.0.0
1919
- ree
2020
- rbx-3
21-
- jruby-9.1.7.0 # pin JRuby to this until travis/rvm can install later versions
2221
- jruby-head
2322
- jruby-1.7
2423
env:

0 commit comments

Comments
 (0)