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

JonRowe · web-flow · commit 92de15261584 · 2021-01-22T11:01:13.000Z
Updates from rspec-dev (2021-01-22)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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
@@ -70,7 +70,9 @@ jobs:
   legacy:
     name: Legacy Ruby Builds (${{ matrix.container.version }})
     runs-on: ubuntu-20.04
-    container: ${{ matrix.container.tag }}
+    container:
+      image: ${{ matrix.container.tag }}
+      options: ${{ matrix.container.options || '--add-host github-complains-if-this-is-empty.com:127.0.0.1' }}
     strategy:
       fail-fast: false
       matrix:
@@ -79,13 +81,25 @@ jobs:
             tag: rspec/ci:2.0.0
           - version: "1.9.3"
             tag: rspec/ci:1.9.3
+          - version: "1.9.2"
+            tag: rspec/ci:1.9.2
+            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
+          - version: "REE"
+            tag: rspec/ci:ree
+            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
           - version: "JRuby 1.7"
             tag: rspec/ci:jruby-1.7
+          - version: "JRuby 1.7 1.8 mode"
+            tag: rspec/ci:jruby-1.7
+            jruby_opts: '--dev --1.8'
+            pre: gem uninstall jruby-openssl
+            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
     env:
       LEGACY_CI: true
       JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
     steps:
       - uses: actions/checkout@v2
+      - run: ${{ matrix.container.pre }}
       - run: script/legacy_setup.sh
       - run: bundle exec bin/rspec
       - run: bundle exec script/cucumber.sh
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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.
@@ -16,12 +16,7 @@ bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "script/run_build"
 rvm:
   - 1.8.7
-  - 1.9.2
-  - ree
 matrix:
-  include:
-    - rvm: jruby-1.7
-      env: JRUBY_OPTS='--dev --1.8'
   fast_finish: true
 branches:
   only:
diff --git a/Gemfile b/Gemfile
@@ -46,6 +46,8 @@ end
 
 if RUBY_VERSION <= '2.3.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
   gem "childprocess", "< 1.0.0"
+elsif RUBY_VERSION < '2.0.0'
+  gem "childprocess", "< 1.0.0"
 end
 
 if RUBY_VERSION < '1.9.2'
@@ -57,13 +59,21 @@ if RUBY_VERSION < '2.4.0'
   gem 'minitest', '< 5.12.0'
 end
 
+if RUBY_VERSION < '2.0.0'
+  gem 'thor', '< 1.0.0'
+else
+  gem 'thor', '> 1.0.0'
+end
+
 ### deps for rdoc.info
 group :documentation do
   gem 'redcarpet', :platform => :mri
   gem 'github-markup', :platform => :mri
 end
 
-gem 'simplecov', '~> 0.8'
+group :coverage do
+  gem 'simplecov', '~> 0.8'
+end
 
 if RUBY_VERSION < '2.0.0' || RUBY_ENGINE == 'java'
   gem 'json', '< 2.0.0' # this is a dependency of simplecov
diff --git a/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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:
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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
diff --git a/script/cucumber.sh b/script/cucumber.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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
diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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 )"
diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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
 source script/functions.sh
 
-bundle install --standalone --binstubs
+bundle install --standalone --binstubs --without coverage documentation
 
 if [ -x ./bin/rspec ]; then
   echo "RSpec bin detected"
diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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 {
diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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
@@ -30,6 +30,7 @@ fi
 
 if supports_cross_build_checks; then
   fold "one-by-one specs" run_specs_one_by_one
+  export NO_COVERAGE=true
   run_all_spec_suites
 else
   echo "Skipping the rest of the build on non-MRI rubies"
diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-22T09:55:42+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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2021-01-02T20:21:17+00:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2021-01-22T09:55:42+00:00 from the rspec-dev repo.`
`2`	`2`	`# DO NOT modify it by hand as your changes will get lost the next time it is generated.`
`3`	`3`
`4`	`4`	`# This file contains defaults for RSpec projects. Individual projects`