Merge pull request #485 from rspec/update-ci-build-scripts-2021-01-02-for-main

Updates from rspec-dev (2021-01-02)

Author: JonRowe

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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
@@ -79,8 +79,11 @@ jobs:
             tag: rspec/ci:2.0.0
           - version: "1.9.3"
             tag: rspec/ci:1.9.3
+          - version: "JRuby 1.7"
+            tag: rspec/ci:jruby-1.7
     env:
       LEGACY_CI: true
+      JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
     steps:
       - uses: actions/checkout@v2
       - run: script/legacy_setup.sh

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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.
@@ -18,9 +18,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - ree
-  - jruby-1.7
-env:
-  - JRUBY_OPTS='--dev'
 matrix:
   include:
     - rvm: jruby-1.7

script/ci_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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/cucumber.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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/legacy_setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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 2021-01-02T12:38:45+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-02T20:21:17+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

spec/rspec/support/ruby_features_spec.rb

@@ -165,7 +165,7 @@ def ripper_can_parse_source_referencing_keyword_arguments?
         end
 
         it 'returns whether Ripper is correctly implemented in the current environment' do
-          if RSpec::Support::Ruby.jruby? && RSpec::Support::Ruby.jruby_version < '9.2.1.0'
+          if RSpec::Support::Ruby.jruby? && RSpec::Support::Ruby.jruby_version.between?('9.0.0.0', '9.2.1.0')
             pending "Ripper is not supported on JRuby 9.1.17.0 despite this tests claims"
           end
           expect(RubyFeatures.ripper_supported?).to eq(ripper_is_implemented? && ripper_works_correctly?)