From 259f205bc37733ead33f1d7069cc7711b7342182 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 3 Sep 2024 14:29:14 +0100 Subject: [PATCH] Updated ci build scripts (from rspec-dev) main --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .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 | 2 +- script/run_build | 2 +- script/run_rubocop | 2 +- script/update_rubygems_and_install_bundler | 2 +- 12 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cd4887074..b48f5a828 100644 --- 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-03T14:29:14+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 b08091b43..08efd4673 100644 --- 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-03T14:29:14+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 @@ -19,7 +19,7 @@ concurrency: env: RSPEC_CI: true # This tells rspec-rails what branch to run in ci - RSPEC_VERSION: '= 3.14.0.pre' + RSPEC_VERSION: '~> 3.13.0' jobs: rubocop: name: Rubocop diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index de2a100f1..37ddd0a49 100644 --- 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-03T14:29:14+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 97a0bd2b4..415d85a78 100644 --- 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-03T14:29:14+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 c9ea5284d..14c60c45d 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-09-03T12:43:35+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:14+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" + 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 b97b60a95..cd14ad9ff 100755 --- 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-03T14:29:14+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 563966dd1..ea6e1116a 100644 --- 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-03T14:29:14+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 31037bf90..26106cf20 100755 --- 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-03T14:29:14+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 a2586494e..07432e051 100644 --- 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-03T14:29:14+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 index d28b1b0a2..31a78efd2 100755 --- 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-03T14:29:14+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 05259a7a1..44bf46bc4 100755 --- 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-03T14:29:14+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 9391db1e7..0d3f2662d 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-09-03T12:43:35+01:00 from the rspec-dev repo. +# This file was generated on 2024-09-03T14:29:14+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