Skip to content

Commit 4953f40

Browse files
committed
Merge pull request #73 from TelekomLabs/travis4ruby2+
bugfix: adjust travis to work with chef12/ruby2
2 parents e071016 + 3367ac6 commit 4953f40

File tree

3 files changed

+44
-4
lines changed

3 files changed

+44
-4
lines changed

.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ rvm:
22
- 1.9.3
33
- 2.0.0
44
- 2.1.3
5+
gemfile:
6+
- Gemfile
7+
- gemfile.chef-11
58
language: ruby
69
bundler_args: "--without development integration openstack"
710
notifications:
811
slack:
912
secure: bOxdT8KjXuWpBaNvMsf1zGcBRS5Ua3ESYcBWUEXXKE+f+AatmATCdynHq1QJBzE6NtWcGvxlacF4oA3FMmMhJZW9PF3igmYK2TC/aF8TXQ+nE8uzibkj+BphI6/so6TnXCPxoCp6TQ8gZm9cWyj1M4gnFJiZx9eYMVKCIOSRU/0=
13+
matrix:
14+
exclude:
15+
- rvm: 1.9.3
16+
gemfile: Gemfile

Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
source 'https://rubygems.org'
44

55
gem 'berkshelf', '~> 3.0'
6-
gem 'chef', '>= 11.14'
6+
gem 'chef', '>= 12.0'
77

88
group :test do
99
gem 'rake'
10-
gem 'chefspec', '~> 4.1.1'
11-
gem 'foodcritic', '~> 3.0'
10+
gem 'chefspec', '~> 4.2.0'
11+
gem 'foodcritic', '~> 4.0'
1212
gem 'thor-foodcritic'
13-
gem 'rubocop', '~> 0.27.0'
13+
gem 'rubocop', '~> 0.28.0'
1414
gem 'coveralls', require: false
1515
end
1616

gemfile.chef-11

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# encoding: utf-8
2+
3+
source 'https://rubygems.org'
4+
5+
gem 'berkshelf', '~> 3.0'
6+
gem 'chef', '~> 11.16'
7+
8+
group :test do
9+
gem 'rake'
10+
gem 'chefspec', '~> 4.1.1'
11+
gem 'foodcritic', '~> 3.0'
12+
gem 'thor-foodcritic'
13+
gem 'rubocop', '~> 0.28.0'
14+
gem 'coveralls', require: false
15+
end
16+
17+
group :development do
18+
gem 'guard'
19+
gem 'guard-rspec'
20+
gem 'guard-kitchen'
21+
gem 'guard-rubocop'
22+
gem 'guard-foodcritic'
23+
end
24+
25+
group :integration do
26+
gem 'test-kitchen', '~> 1.0'
27+
gem 'kitchen-vagrant'
28+
gem 'kitchen-sharedtests', '~> 0.2.0'
29+
end
30+
31+
group :openstack do
32+
gem 'kitchen-openstack'
33+
end

0 commit comments

Comments
 (0)