Skip to content

Commit 8b78d97

Browse files
authored
Merge pull request #54 from ms-ati/fix-rake-rspec-incompatibility
Fix test breakage due to newer Rake incompatibility
2 parents 99d0fc5 + 14165a5 commit 8b78d97

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

.travis.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,36 @@
11
language: ruby
2-
cache: bundler
3-
sudo: false
2+
3+
# Apparently sudo is required to test on Rubinius and JRuby-head
4+
sudo: required
5+
6+
# See https://docs.travis-ci.com/user/languages/ruby/#Rubinius
7+
dist: trusty
8+
49
rvm:
10+
# MRI
511
- ruby-head
12+
- 2.4
13+
- 2.3
614
- 2.2
715
- 2.1
8-
- 2.0.0
16+
- 2.0
17+
- 1.9.2 # allowed to fail until Travis binary for this is fixed
918
- 1.9.3
10-
- 1.9.2
1119
- 1.8.7
1220
- ree
21+
# JRuby
1322
- jruby-head
23+
- jruby-9.1
24+
- jruby-9.0
1425
- jruby-19mode
1526
- jruby-18mode
16-
- rbx-2
27+
# Rubinius
28+
- rubinius-3
29+
1730
matrix:
1831
allow_failures:
1932
- rvm: ruby-head
33+
- rvm: 1.9.2 # See build error https://travis-ci.org/tcrayford/Values/jobs/202728857
2034
- rvm: jruby-head
35+
- rvm: rubinius-3
2136
fast_finish: true

Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@ source 'https://rubygems.org'
22

33
group :test do
44
if RUBY_VERSION >= '2.2'
5-
gem 'rake'
5+
# WORKAROUND (2017-02-17): Rake 11.0 breaks RSpec < 3.5. We stay with
6+
# older RSpec to test older Rubies, so we must pin Rake version.
7+
# See: http://stackoverflow.com/questions/35893584/nomethoderror-undefined-method-last-comment-after-upgrading-to-rake-11
8+
gem 'rake', '< 11.0'
9+
10+
# Only bother supporting code coverage on relatively recent Rubies
611
gem 'codecov', :require => false
712
else
13+
# Avoid incompatibilities that break builds on Ruby 1.8.7, until we drop support
814
gem 'rake', '~> 10.4'
915
end
1016
end
1117

18+
# Only support building documentation, and therefore supporting those
19+
# dependencies, on recent MRI Rubies when not running on Travis CI.
1220
if (defined?(RUBY_ENGINE) &&
1321
RUBY_ENGINE == 'ruby' &&
1422
RUBY_VERSION >= '2.2' &&

0 commit comments

Comments
 (0)