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

Commit 26bc43e

Browse files
authored
Merge pull request #2970 from rspec/update-ci-build-scripts-2022-09-09-for-4-0-dev
Updates from rspec-dev (2022-09-09)
2 parents 16429e9 + 95dfc7e commit 26bc43e

File tree

9 files changed

+22
-11
lines changed

9 files changed

+22
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
1+
# This file was generated on 2022-09-09T14:27:55+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
@@ -22,7 +22,7 @@ jobs:
2222
name: Rubocop
2323
runs-on: 'ubuntu-20.04'
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626
- uses: ruby/setup-ruby@v1
2727
with:
2828
ruby-version: '3.0'
@@ -47,7 +47,7 @@ jobs:
4747
- 2.3
4848
env:
4949
-
50-
RAILS_VERSION: '~> 6.1.0'
50+
__UNUSED_VARIABLE: "Prevents build error when {matrix.env} is used."
5151
include:
5252
- ruby: ruby-head
5353
env:

.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 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
1+
# This file was generated on 2022-09-09T14:27:55+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 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
1+
# This file was generated on 2022-09-09T14:27:55+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 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
2+
# This file was generated on 2022-09-09T14:27:55+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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
1+
# This file was generated on 2022-09-09T14:27:55+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 )"
@@ -192,6 +192,9 @@ function run_all_spec_suites {
192192
fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
193193
fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
194194
if rspec_rails_compatible; then
195+
if ! is_ruby_27_plus; then
196+
export RAILS_VERSION='~> 6.1.0'
197+
fi
195198
fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
196199
fi
197200

script/predicate_functions.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
1+
# This file was generated on 2022-09-09T14:27:55+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 {
@@ -95,6 +95,14 @@ function is_ruby_25_plus {
9595
fi
9696
}
9797

98+
function is_ruby_27_plus {
99+
if ruby -e "exit(RUBY_VERSION.to_f >= 2.7)"; then
100+
return 0
101+
else
102+
return 1
103+
fi
104+
}
105+
98106
function is_ruby_31_plus {
99107
if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then
100108
return 0

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 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
2+
# This file was generated on 2022-09-09T14:27:55+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 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
2+
# This file was generated on 2022-09-09T14:27:55+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 2022-09-09T13:21:55+01:00 from the rspec-dev repo.
2+
# This file was generated on 2022-09-09T14:27:55+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)