Skip to content

Commit 6fc5073

Browse files
authored
Merge pull request #278 from MSP-Greg/travis-fix
Travis fix
2 parents 31d8642 + cb46d88 commit 6fc5073

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
language: ruby
22
cache: bundler
33
before_install:
4-
- gem update --system 2.7.7
5-
- gem install bundler -v 1.16.2
4+
# rubygems 2.7.8 and greater include bundler
5+
- |
6+
rv="$(ruby -e 'STDOUT.write RUBY_VERSION')";
7+
if [ "$rv" \< "2.3" ]; then gem update --system 2.7.10 --no-document
8+
elif [ "$rv" \< "2.7" ]; then gem update --system --no-document --conservative
9+
fi
10+
- ruby -v && gem --version && bundle version
11+
612
addons:
713
apt:
814
packages:

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ gem "mini_portile", "~>0.6.2", :group => [:development, :test]
1212
gem "hoe-bundler", "~>1.0", :group => [:development, :test]
1313
gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
1414
gem "rdoc", ">=4.0", "<6", :group => [:development, :test]
15-
gem "hoe", "~>3.17", :group => [:development, :test]
15+
16+
# hoe versions >= 3.19.0 are incompatible with Ruby 2.0 and earlier,
17+
# but the gemspec does not indicate so...
18+
gem "hoe", (RUBY_VERSION < "2.1" ? "3.18.1" : "~>3.20"), :group => [:development, :test]
1619

1720
# vim: syntax=ruby

0 commit comments

Comments
 (0)