Skip to content

Commit 4e81a61

Browse files
authored
Merge pull request #246 from ghoneycutt/ruby231
Add support for Ruby 2.3.1
2 parents a33da5f + 3645e23 commit 4e81a61

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rvm:
1010
- 1.9.3
1111
- 2.0.0
1212
- 2.1.1
13+
- 2.3.1
1314
env:
1415
matrix:
1516
- PUPPET_GEM_VERSION="~> 3.7.1"
@@ -25,5 +26,13 @@ matrix:
2526
exclude:
2627
- rvm: 1.8.7
2728
env: PUPPET_GEM_VERSION="~> 4"
29+
- rvm: 2.3.1
30+
env: PUPPET_GEM_VERSION="~> 3.7.1"
31+
- rvm: 2.3.1
32+
env: PUPPET_GEM_VERSION="~> 3.7"
33+
- rvm: 2.3.1
34+
env: PUPPET_GEM_VERSION="~> 3"
35+
- rvm: 2.3.1
36+
env: PUPPET_GEM_VERSION="~> 3" PARSER="future"
2837
notifications:
2938
email: false

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ group :development, :test do
88
gem 'rspec-core', '3.1.7'
99
gem 'rspec-puppet', '~> 2.0'
1010
gem 'puppet-lint', '~> 1.1'
11-
gem 'metadata-json-lint'
11+
gem 'metadata-json-lint', '0.0.11' if RUBY_VERSION < '1.9'
12+
gem 'metadata-json-lint' if RUBY_VERSION >= '1.9'
1213
gem 'json_pure', '~> 1.8'
1314
end
1415

0 commit comments

Comments
 (0)