Merge pull request #1589 from rspec/update-ci-build-scripts-2024-09-0…

…3-for-3-13 Updates from rspec-dev (2024-09-03)
rspec · Sep 3, 2024 · 40cdc47 · 40cdc47
2 parents b048236 + 91260db
commit 40cdc47
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 23 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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.
 
 version: 2

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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

diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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
@@ -12,7 +12,7 @@ if is_mri; then
   clone_repo "rspec-core"
   clone_repo "rspec-expectations"
   clone_repo "rspec-mocks"
-  clone_repo "rspec-rails" "rspec-rails" "6-1-maintenance"
+  clone_repo "rspec-rails" "rspec-rails" "7-0-maintenance"
 
   if rspec_support_compatible; then
     clone_repo "rspec-support"

diff --git a/script/cucumber.sh b/script/cucumber.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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 )"
@@ -204,9 +204,6 @@ function run_all_spec_suites {
   fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
   fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
   if rspec_rails_compatible; then
-    if ! is_ruby_27_plus; then
-      export RAILS_VERSION='~> 6.1.0'
-    fi
     fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
   fi
 

diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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 {
@@ -112,13 +112,8 @@ function is_ruby_31_plus {
 }
 
 function rspec_rails_compatible {
-  if is_ruby_25_plus; then
-    # TODO remove when RSpec-Rails build is 3.1 safe by default
-    if is_ruby_31_plus; then
-      return 1
-    else
-      return 0
-    fi
+  if is_ruby_27_plus; then
+    return 0
   else
     return 1
   fi

diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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/script/run_rubocop b/script/run_rubocop
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:04:33+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