Skip to content

Commit 62f74d6

Browse files
author
Joshua Hoblitt
committed
Merge pull request jhoblitt#22 from jhoblitt/feature/future_parser
add future parser to travis matrix
2 parents aaa9adc + 37d72d4 commit 62f74d6

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ rvm:
33
- 1.8.7
44
- 1.9.3
55
- 2.0.0
6+
- 2.1.4
67
env:
7-
- PUPPET_GEM_VERSION="2.7.14"
88
- PUPPET_GEM_VERSION="~> 2.7"
99
- PUPPET_GEM_VERSION="~> 3.3"
10+
- PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
1011
matrix:
1112
allow_failures:
1213
- rvm: ruby-head
1314
exclude:
14-
- rvm: 1.9.3
15-
env: PUPPET_GEM_VERSION="2.7.14"
16-
- rvm: 2.0.0
17-
env: PUPPET_GEM_VERSION="2.7.14"
1815
- rvm: 1.9.3
1916
env: PUPPET_GEM_VERSION="~> 2.7"
2017
- rvm: 2.0.0
2118
env: PUPPET_GEM_VERSION="~> 2.7"
19+
- rvm: 2.1.4
20+
env: PUPPET_GEM_VERSION="~> 2.7"
21+
fast_finish: true
2222
notifications:
2323
email: false

Gemfile

+10-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ else
66
gem 'puppet', :require => false
77
end
88

9-
gem 'rake', :require => false
10-
gem 'puppetlabs_spec_helper', :require => false
11-
gem 'puppet-lint', :require => false
12-
gem 'puppet-syntax', :require => false
13-
gem 'rspec-puppet', :require => false
9+
gem 'rake', :require => false
10+
gem 'puppetlabs_spec_helper', :require => false
11+
gem 'puppet-lint', :require => false
12+
gem 'puppet-syntax', :require => false
13+
gem 'rspec-puppet',
14+
:git => 'https://github.com/rodjek/rspec-puppet.git',
15+
:ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
16+
:require => false
17+
# rspec 3 spews warnings with rspec-puppet 1.0.1
18+
# gem 'rspec-core', '~> 2.0', :require => false
1419
gem 'beaker', :require => false
1520
gem 'beaker-rspec', :require => false
1621
gem 'serverspec', :require => false

0 commit comments

Comments
 (0)