Updated ci build scripts (from rspec-dev)

Author: JonRowe

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 name: RSpec CI
@@ -13,7 +13,7 @@ on:
       - '*'
 jobs:
   test:
-    name: Ruby ${{ matrix.ruby }}
+    name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || "" }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -27,19 +27,42 @@ 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
+            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') }}
     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
+        env: ${{ matrix.env }}
       - run: script/clone_all_rspec_repos
+        env: ${{ matrix.env }}
       - run: bundle install --binstubs --standalone
+        env: ${{ matrix.env }}
       - run: script/run_build
+        env: ${{ matrix.env }}
 
   windows:
     name: Ruby ${{ matrix.ruby }} (Windows)

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # In order to install old Rubies, we need to use old Ubuntu distibution.
@@ -20,24 +20,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:

script/ci_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from:

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/update_rubygems_and_install_bundler

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-21T12:30:59+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e