From c4cb3808856c7033ea2c3dd9953b1dbed6613357 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 3 Sep 2024 12:43:35 +0100 Subject: [PATCH] Updated ci build scripts (from rspec-dev) main --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 2 +- .rubocop_rspec_base.yml | 2 +- script/ci_functions.sh | 2 +- script/clone_all_rspec_repos | 2 +- script/cucumber.sh | 2 +- script/functions.sh | 2 +- 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, 14 insertions(+), 19 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ed804dc02..cd4887074 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 4df8842cb..b08091b43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 ac0ca028d..de2a100f1 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 07f0053b5..97a0bd2b4 100644 --- a/script/ci_functions.sh +++ b/script/ci_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 3b3e38304..c9ea5284d 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-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 index 91c6bb307..b97b60a95 100755 --- a/script/cucumber.sh +++ b/script/cucumber.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 31fb569b7..563966dd1 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 )" diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh index 3f58c767e..31037bf90 100755 --- a/script/legacy_setup.sh +++ b/script/legacy_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 1c7172af4..a2586494e 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 066c0e892..d28b1b0a2 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 a1e06dca5..05259a7a1 100755 --- a/script/run_rubocop +++ b/script/run_rubocop @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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 9bc9ee32e..9391db1e7 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-15T21:58:52+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T12:43:35+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