[expectations] Merge pull request rspec/rspec-expectations#1309 from …

…rspec/update-ci-build-scripts-2021-07-13-for-4-0-dev Updates from rspec-dev (2021-07-13) --- This commit was imported from rspec/rspec-expectations@cec1e53.
yujinakayama · Jul 13, 2021 · f43d3e0 · f43d3e0
2 parents 4cfdd82 + c77f035
commit f43d3e0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 20 deletions.
diff --git a/rspec-expectations/.github/workflows/ci.yml b/rspec-expectations/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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
@@ -50,11 +50,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          bundler: ${{ matrix.bundler || 2 }}
+          bundler: ${{ matrix.bundler || '2.2.22' }}
           ruby-version: ${{ matrix.ruby }}
       - run: script/update_rubygems_and_install_bundler
       - run: script/clone_all_rspec_repos
-      - run: bundle install --binstubs --standalone
+      - run: bundle install --standalone
+      - run: bundle binstubs --all
       - run: script/run_build
 
   windows:
@@ -73,7 +74,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          bundler: 2
+          bundler: '2.2.22'
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: cinst ansicon

diff --git a/rspec-expectations/.rubocop_rspec_base.yml b/rspec-expectations/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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/rspec-expectations/script/ci_functions.sh b/rspec-expectations/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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/rspec-expectations/script/clone_all_rspec_repos b/rspec-expectations/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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/rspec-expectations/script/functions.sh b/rspec-expectations/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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 )"
@@ -139,10 +139,7 @@ function check_binstubs {
     echo "  $ bundle binstubs$gems"
     echo
     echo "  # To binstub all gems"
-    echo "  $ bundle install --binstubs"
-    echo
-    echo "  # To binstub all gems and avoid loading bundler"
-    echo "  $ bundle install --binstubs --standalone"
+    echo "  $ bundle binstubs --all"
   fi
 
   return $success

diff --git a/rspec-expectations/script/predicate_functions.sh b/rspec-expectations/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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 {
@@ -129,9 +129,13 @@ function documentation_enforced {
 }
 
 function style_and_lint_enforced {
- if [ -x ./bin/rubocop ]; then
-   return 0
- else
+  if is_ruby_head; then
    return 1
+ else
+   if [ -x ./bin/rubocop ]; then
+     return 0
+   else
+     return 1
+   fi
  fi
 }
diff --git a/rspec-expectations/script/run_build b/rspec-expectations/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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/rspec-expectations/script/update_rubygems_and_install_bundler b/rspec-expectations/script/update_rubygems_and_install_bundler
@@ -1,13 +1,13 @@
 #!/bin/bash
-# This file was generated on 2020-12-31T00:51:10+03:00 from the rspec-dev repo.
+# This file was generated on 2021-07-13T11:08:51+01: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
 
 if is_ruby_23_plus; then
-  yes | gem update --system
-  yes | gem install bundler
+  yes | gem update --system '3.2.22'
+  yes | gem install bundler -v '2.2.22'
 else
   echo "Warning installing older versions of Rubygems / Bundler"
   gem update --system '2.7.8'