From 4a8fbe3b805f40dc2ce3f89718aabb30704cccf8 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 3 Sep 2024 15:04:33 +0100 Subject: [PATCH] Updated ci build scripts (from rspec-dev) 3-13 --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 2 +- .rubocop_rspec_base.yml | 2 +- script/ci_functions.sh | 2 +- script/clone_all_rspec_repos | 4 ++-- script/cucumber.sh | 2 +- script/functions.sh | 5 +---- script/legacy_setup.sh | 2 +- script/predicate_functions.sh | 11 +++-------- script/run_build | 2 +- script/run_rubocop | 2 +- script/update_rubygems_and_install_bundler | 2 +- 12 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c8d6ee094..445712062 100644 --- 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 index aa95b8776..6433c19b8 100644 --- 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 index 49b4c1f47..e538bcd66 100644 --- 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 index 1e93b3079..b4d76a20e 100644 --- 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 index fdfdf341c..817477047 100755 --- 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 index 3e3ce5bb4..a2426d7fb 100755 --- 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 index d715b9c16..3db1ca17c 100644 --- 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 index 635c77ab9..7c2989534 100755 --- 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 index a9b928b41..992fe885a 100644 --- 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 index 70a4640dd..2e441f71f 100755 --- 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 index be676538b..5f46f3162 100755 --- 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 index c9fa78d63..5eebe5643 100755 --- 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