Merge pull request #260 from rspec/more-builds

Build updates for JRuby etc

Author: JonRowe

ci/.github/workflows/ci.yml

@@ -10,8 +10,8 @@ on:
       - '*'
 jobs:
   test:
-    name: Ruby ${{ matrix.ruby }}
-    runs-on: ubuntu-20.04
+    name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
+    runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
     strategy:
       matrix:
         ruby:
@@ -24,15 +24,35 @@ jobs:
           - 2.2
           - 2.1.9
           - ruby-head
+        env:
+          -
+            DIFF_LCS_VERSION: "> 1.4.3"
+        include:
+          - ruby: jruby-9.2.13.0
+            env:
+              JRUBY_OPTS: "--dev"
+          - ruby: jruby-9.1.17.0
+            bundler: 1
+            os: ubuntu-18.04
+            env:
+              JRUBY_OPTS: "--dev"
+          - ruby: 2.7
+            name_extra: "with diff-lcs 1.3"
+            env:
+              DIFF_LCS_VERSION: "~> 1.3.0"
+          - ruby: 2.7
+            name_extra: "with diff-lcs 1.4.3"
+            env:
+              DIFF_LCS_VERSION: "1.4.3"
       fail-fast: false
-    continue-on-error: ${{ matrix.ruby == 'jruby-9.2.13.0' || endsWith(matrix.ruby, 'head') }}
+    continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
+    env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          bundler: ${{ (matrix.ruby == 'jruby-9.1.17.0' && 1) || 2 }}
+          bundler: ${{ matrix.bundler || 2 }}
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
       - run: script/update_rubygems_and_install_bundler
       - run: script/clone_all_rspec_repos
       - run: bundle install --binstubs --standalone

ci/.travis.yml

@@ -17,24 +17,13 @@ rvm:
   - 1.9.3
   - 2.0.0
   - ree
-  - rbx-3
-  - jruby-9.1.7.0 # pin JRuby to this until travis/rvm can install later versions
-  - jruby-head
   - jruby-1.7
 env:
   - JRUBY_OPTS='--dev'
 matrix:
   include:
     - rvm: jruby-1.7
       env: JRUBY_OPTS='--dev --1.8'
-    - rvm: 2.7.1
-      env: DIFF_LCS_VERSION="~> 1.3.0"
-    - rvm: 2.7.1
-      env: DIFF_LCS_VERSION="1.4.3"
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: rbx-3
   fast_finish: true
 branches:
   only: