Merge pull request #440 from rspec/update-ci-build-scripts-2020-11-21-for-main

Updates from rspec-dev (2020-11-21)

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:40:56+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,8 +13,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:
@@ -27,19 +27,43 @@ 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') }}
     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:40:56+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:40:56+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:

lib/rspec/support/ruby_features.rb

@@ -60,7 +60,7 @@ def truffleruby?
     module RubyFeatures
     module_function
 
-      if Ruby.jruby?
+      if Ruby.jruby? && RUBY_VERSION.to_f < 1.9
         # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,
         # but when you try to fork, it raises an error:
         #   NotImplementedError: fork is not available on this platform
@@ -111,8 +111,10 @@ def supports_taint?
         ripper_requirements.push(Ruby.jruby_version >= '1.7.5')
         # Ripper on JRuby 9.0.0.0.rc1 - 9.1.8.0 reports wrong line number
         # or cannot parse source including `:if`.
-        # Ripper on JRuby 9.x.x.x < 9.2.1.0 can't handle keyword arguments.
-        ripper_requirements.push(!Ruby.jruby_version.between?('9.0.0.0.rc1', '9.2.0.0'))
+        # Ripper on JRuby 9.x.x.x < 9.1.17.0 can't handle keyword arguments
+        # Neither can JRuby 9.2, e.g. < 9.2.1.0
+        ripper_requirements.push(!Ruby.jruby_version.between?('9.0.0.0.rc1', '9.1.16.0'))
+        ripper_requirements.push(!Ruby.jruby_version.between?('9.1.999.0', '9.1.999.0'))
       end
 
       if ripper_requirements.all?

lib/rspec/support/spec/shell_out.rb

@@ -59,7 +59,7 @@ def run_ruby_with_current_load_path(ruby_command, *flags)
           %r{bundler/source/rubygems},
           # Ignore bundler + rubygems warning.
           %r{site_ruby/\d\.\d\.\d/rubygems},
-          %r{jruby-\d\.\d\.\d\.\d/lib/ruby/stdlib/rubygems},
+          %r{jruby-\d\.\d\.\d+\.\d/lib/ruby/stdlib/rubygems},
           # This is required for windows for some reason
           %r{lib/bundler/rubygems},
           # This is a JRuby file that generates warnings on 9.0.3.0
@@ -70,8 +70,10 @@ def run_ruby_with_current_load_path(ruby_command, *flags)
           %r{ffi-1\.13\.\d+-java},
           %r{uninitialized constant FFI},
           # These are related to the above, there is a warning about io from FFI
-          %r{jruby-\d\.\d\.\d\.\d/lib/ruby/stdlib/io},
+          %r{jruby-\d\.\d\.\d+\.\d/lib/ruby/stdlib/io},
           %r{io/console on JRuby shells out to stty for most operations},
+          # This is a JRuby 9.1.17.0 error on Github Actions
+          %r{io/console not supported; tty will not be manipulated},
         ]
 
       def strip_known_warnings(input)

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:40:56+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:40:56+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:40:56+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:40:56+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:40:56+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:40:56+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