Skip to content

Commit e28b863

Browse files
author
Joshua Hoblitt
committed
Merge pull request jhoblitt#30 from jhoblitt/feature/travis_1.8.7
fix travis ruby 1.8.7 runs
2 parents 6310705 + b5a9110 commit e28b863

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
sudo: false
12
language: ruby
3+
bundler_args: --without beaker
24
rvm:
35
- 1.8.7
46
- 1.9.3

Gemfile

+19-14
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,22 @@ 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',
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
19-
gem 'beaker', :require => false
20-
gem 'beaker-rspec', :require => false
21-
gem 'serverspec', :require => false
22-
gem 'pry', :require => false
9+
group :development do
10+
gem 'rake', :require => false
11+
gem 'puppetlabs_spec_helper', :require => false
12+
gem 'puppet-lint', :require => false
13+
gem 'puppet-syntax', :require => false
14+
gem 'rspec-puppet',
15+
:git => 'https://github.com/rodjek/rspec-puppet.git',
16+
:ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
17+
:require => false
18+
# rspec 3 spews warnings with rspec-puppet 1.0.1
19+
# gem 'rspec-core', '~> 2.0', :require => false
20+
gem 'pry', :require => false
21+
end
22+
23+
group :beaker do
24+
gem 'beaker', :require => false
25+
gem 'beaker-rspec', :require => false
26+
gem 'serverspec', :require => false
27+
end

0 commit comments

Comments
 (0)