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

Commit a3e3c3d

Browse files
authored
Merge pull request #615 from rspec/update-ci-build-scripts-2024-09-03-for-main
Updates from rspec-dev (2024-09-03)
2 parents 5ac349f + a2ce9b2 commit a3e3c3d

12 files changed

+12
-15
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-09-03T12:43:35+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:05:50+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-09-03T12:43:35+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:05:50+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/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-09-03T12:43:35+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:05:50+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-09-03T12:43:35+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T15:05:50+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 {

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-09-03T12:43:35+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:05:50+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-09-03T12:43:35+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T15:05:50+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)