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

Commit 0947252

Browse files
JonRoweJonRowe
authored
Merge pull request #1482 from rspec/update-ci-build-scripts-2024-09-03-for-main
Updates from rspec-dev (2024-09-03)
2 parents 2bf42aa + c4cb380 commit 0947252

12 files changed

+14
-19
lines changed

‎.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T12:43:35+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 )"

‎script/legacy_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
1+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T12:43:35+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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-15T21:58:52+01:00 from the rspec-dev repo.
2+
# This file was generated on 2024-09-03T12:43:35+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)