Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 40cdc47

Browse files
JonRoweJonRowe
authored
Merge pull request #1589 from rspec/update-ci-build-scripts-2024-09-03-for-3-13
Updates from rspec-dev (2024-09-03)
2 parents b048236 + 91260db commit 40cdc47

12 files changed

+15
-23
lines changed

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: 2

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
name: RSpec CI

‎.rubocop_rspec_base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects

‎script/ci_functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

‎script/clone_all_rspec_repos

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e
@@ -12,7 +12,7 @@ if is_mri; then
1212
clone_repo "rspec-core"
1313
clone_repo "rspec-expectations"
1414
clone_repo "rspec-mocks"
15-
clone_repo "rspec-rails" "rspec-rails" "6-1-maintenance"
15+
clone_repo "rspec-rails" "rspec-rails" "7-0-maintenance"
1616

1717
if rspec_support_compatible; then
1818
clone_repo "rspec-support"

‎script/cucumber.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

‎script/functions.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -204,9 +204,6 @@ function run_all_spec_suites {
204204
fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
205205
fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
206206
if rspec_rails_compatible; then
207-
if ! is_ruby_27_plus; then
208-
export RAILS_VERSION='~> 6.1.0'
209-
fi
210207
fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
211208
fi
212209

‎script/legacy_setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

‎script/predicate_functions.sh

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {
@@ -112,13 +112,8 @@ function is_ruby_31_plus {
112112
}
113113

114114
function rspec_rails_compatible {
115-
if is_ruby_25_plus; then
116-
# TODO remove when RSpec-Rails build is 3.1 safe by default
117-
if is_ruby_31_plus; then
118-
return 1
119-
else
120-
return 0
121-
fi
115+
if is_ruby_27_plus; then
116+
return 0
122117
else
123118
return 1
124119
fi

‎script/run_build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

‎script/run_rubocop

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

‎script/update_rubygems_and_install_bundler

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T22:27:33+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:04:33+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

0 commit comments

Comments
 (0)