Skip to content

Commit

Permalink
Merge pull request #1589 from rspec/update-ci-build-scripts-2024-09-0…
Browse files Browse the repository at this point in the history
…3-for-3-13

Updates from rspec-dev (2024-09-03)
  • Loading branch information
JonRowe authored Sep 3, 2024
2 parents b048236 + 91260db commit 40cdc47
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/ci_functions.sh
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions script/clone_all_rspec_repos
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion script/cucumber.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions script/functions.sh
Original file line number Diff line number Diff line change
@@ -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 )"
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion script/legacy_setup.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 3 additions & 8 deletions script/predicate_functions.sh
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/run_rubocop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/update_rubygems_and_install_bundler
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 40cdc47

Please sign in to comment.