Merge pull request #2969 from rspec/update-ci-build-scripts-2022-09-09-for-4-0-dev

Updates from rspec-dev (2022-09-09)

Author: JonRowe

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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
@@ -11,26 +11,43 @@ on:
   pull_request:
     branches:
       - '*'
+permissions:
+  contents: read
 env:
   RSPEC_CI: true
   # This tells rspec-rails what branch to run in ci
   RSPEC_VERSION: '= 4.0.0.pre'
 jobs:
+  rubocop:
+    name: Rubocop
+    runs-on: 'ubuntu-20.04'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - run: script/update_rubygems_and_install_bundler
+      - run: script/clone_all_rspec_repos
+      - run: bundle install --standalone
+      - run: bundle binstubs --all
+      - run: script/run_rubocop
+
   test:
     name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}
     runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
     strategy:
       matrix:
         ruby:
-          - 3.0
+          - '3.1'
+          - '3.0'
           - 2.7
           - 2.6
           - 2.5
           - 2.4
           - 2.3
         env:
           -
-            __UNUSED_VARIABLE: "Prevents build error when {matrix.env} is used."
+            RAILS_VERSION: '~> 6.1.0'
         include:
           - ruby: ruby-head
             env:
@@ -47,7 +64,7 @@ jobs:
     continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
     env: ${{ matrix.env }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           bundler: ${{ matrix.bundler || '2.2.22' }}
@@ -71,7 +88,7 @@ jobs:
           - 2.3
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           bundler: '2.2.22'

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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

script/ci_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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:

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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 )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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 {
@@ -95,9 +95,22 @@ function is_ruby_25_plus {
   fi
 }
 
+function is_ruby_31_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 function rspec_rails_compatible {
   if is_ruby_25_plus; then
-    return 0
+    # TODO remove when RSpec-Rails build is 3.1 safe by default
+    if is_ruby_31_plus; then
+      return 1
+    else
+      return 0
+    fi
   else
     return 1
   fi

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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
@@ -24,10 +24,6 @@ if documentation_enforced; then
   fold "doc check" check_documentation_coverage
 fi
 
-if style_and_lint_enforced; then
-  fold "rubocop" check_style_and_lint
-fi
-
 if supports_cross_build_checks; then
   fold "one-by-one specs" run_specs_one_by_one
   export NO_COVERAGE=true

script/run_rubocop

@@ -0,0 +1,14 @@
+#!/bin/bash
+# This file was generated on 2022-09-09T13:21:55+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
+
+# Allow repos to override the default functions and add their own
+if [ -f script/custom_build_functions.sh ]; then
+  source script/custom_build_functions.sh
+fi
+
+
+fold "rubocop" check_style_and_lint

script/update_rubygems_and_install_bundler

@@ -1,15 +1,16 @@
 #!/bin/bash
-# This file was generated on 2021-07-15T16:47:05+01:00 from the rspec-dev repo.
+# This file was generated on 2022-09-09T13:21:55+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
+if is_ruby_31_plus; then
+  echo "Installing rubygems 3.3.6 / bundler 2.3.6"
+  yes | gem update --system '3.3.6'
+  yes | gem install bundler -v '2.3.6'
+else
+  echo "Installing rubygems 3.2.22 / bundler 2.2.22"
   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'
-  gem install bundler -v '1.17.3'
 fi