Updated ci build scripts (from rspec-dev)4-0-dev

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-09T10:32:41+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,6 +11,8 @@ on:
   pull_request:
     branches:
       - '*'
+permissions:
+  contents: read
 env:
   RSPEC_CI: true
   # This tells rspec-rails what branch to run in ci
@@ -22,7 +24,8 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.0
+          - '3.1'
+          - '3.0'
           - 2.7
           - 2.6
           - 2.5
@@ -47,7 +50,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 +74,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-09T10:32:41+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-09T10:32:41+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-09T10:32:41+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-09T10:32:41+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-09T10:32:41+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,6 +95,14 @@ 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

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-09T10:32:41+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/update_rubygems_and_install_bundler

@@ -1,11 +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-09T10:32:41+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'
+elif is_ruby_23_plus; then
+  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