Merge pull request #615 from rspec/update-ci-build-scripts-2024-09-03-for-main

JonRowe · web-flow · commit a3e3c3dfaae6 · 2024-09-03T16:08:39.000+01:00
Updates from rspec-dev (2024-09-03)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2024-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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/cucumber.sh b/script/cucumber.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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 {
diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2024-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
+# This file was generated on 2024-09-03T15:05:50+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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2024-09-03T12:43:35+01:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2024-09-03T15:05:50+01: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`	`version: 2`