Skip to content

Commit

Permalink
test chef11/chef12 bundle config
Browse files Browse the repository at this point in the history
  • Loading branch information
btm committed May 19, 2015
1 parent 4efd9ff commit 2ffcda5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 4 deletions.
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
language: ruby

rvm:
- 1.9.3
- 2.0.0
- 2.1.5
- 2.2.0

script: bundle exec rake spec
gemfile:
- Gemfile
- chef11.gemfile

matrix:
exclude:
- rvm: 1.9.3
gemfile: Gemfile

1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ gem 'winrm-s', github: 'chef/winrm-s'

group :test do
gem "rspec", '~> 3.0'
gem "chef"
gem "ruby-wmi"
gem "httpclient"
gem 'rake'
Expand Down
18 changes: 18 additions & 0 deletions chef11.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
source "https://rubygems.org"

# Specify your gem's dependencies in knife-windows.gemspec
gemspec

# TODO: Remove this line when a new version of `winrm-s` is released which contains:
#
# https://github.com/chef/winrm-s/commit/d9a85d7c93ef4c24faaea760cdc58a3532d599e9
#
gem 'winrm-s', github: 'chef/winrm-s'

group :test do
gem "chef", "< 12"
gem "rspec", '~> 3.0'
gem "ruby-wmi"
gem "httpclient"
gem 'rake'
end
2 changes: 1 addition & 1 deletion knife-windows.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|


s.add_development_dependency 'pry'
s.add_development_dependency 'chef', '< 12'
#s.add_development_dependency 'chef', '< 12'

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
Expand Down

0 comments on commit 2ffcda5

Please sign in to comment.