Skip to content

Commit e16ea82

Browse files
committed
Merge pull request #2173 from rspec/fix-build
Pin minitest on older Rubies
1 parent cfcb4f9 commit e16ea82

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ if RUBY_VERSION < '2.0.0'
4747
gem 'mime-types', '< 3'
4848
end
4949

50+
# Version 5.12 of minitest requires Ruby 2.4
51+
if RUBY_VERSION < '2.4.0'
52+
gem 'minitest', '< 5.12.0'
53+
end
5054

5155
# Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
5256
if RUBY_VERSION >= '1.9.3'

script/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function run_specs_one_by_one {
7272

7373
for file in `find spec -iname '*_spec.rb'`; do
7474
echo "Running $file"
75-
bin/rspec $file -b --format progress
75+
bin/rspec $file --format progress
7676
done
7777
}
7878

script/predicate_functions.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ function is_mri_192 {
3333
fi
3434
}
3535

36+
function is_mri_193 {
37+
if is_mri; then
38+
if ruby -e "exit(RUBY_VERSION == '1.9.3')"; then
39+
return 0
40+
else
41+
return 1
42+
fi
43+
else
44+
return 1
45+
fi
46+
}
47+
3648
function is_mri_192_plus {
3749
if is_mri; then
3850
if ruby -e "exit(RUBY_VERSION.to_f > 1.8)"; then

script/run_build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ if style_and_lint_enforced; then
2929
fi
3030

3131
if is_mri; then
32-
fold "one-by-one specs" run_specs_one_by_one
32+
# As of 2019-09-24 this causes a huge log due to a cicular dependency
33+
# disable for now
34+
if !is_mri_193; then
35+
fold "one-by-one specs" run_specs_one_by_one
36+
fi
3337
run_all_spec_suites
3438
else
3539
echo "Skipping the rest of the build on non-MRI rubies"

0 commit comments

Comments
 (0)