Skip to content

Commit

Permalink
Merge pull request #847 from chef/gems
Browse files Browse the repository at this point in the history
Remove gem version constraints and avoid installing pry in Travis
  • Loading branch information
tas50 authored Aug 10, 2018
2 parents 6c24247 + bdc80e0 commit 1c4e4af
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 14 deletions.
19 changes: 14 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
sudo: false
rvm:
- 2.5.1
- 2.4.4
bundler_args: "--jobs 7 --without docs local"
language: ruby

matrix:
include:
- rvm: 2.4.4
- rvm: 2.5.1
- rvm: ruby-head
allow_failures:
- rvm: ruby-head
bundler_args: "--jobs 7 --without docs debug"
branches:
only:
- 2.0-stable
- 3.0-stable
- master
before_install:
- gem update --system
- gem --version
- rvm @global do gem uninstall bundler -a -x -I || true
- gem install bundler
- bundle --version
- rm -f .bundle/config
before_script:
- git config --global user.email "[email protected]"
- git config --global user.name "Pink Panther"
Expand Down
17 changes: 10 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
source "https://rubygems.org"
gemspec

# net-ssh 4.x does not work with Ruby 2.2 on Windows. Chef and ChefDK
# are pinned to 3.2 so pinning that here. Only used by fauxhai in this project
gem "net-ssh", "3.2.0"
gemspec

group :docs do
gem "yard", "~> 0.9"
gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7"
gem "yard"
gem "redcarpet"
gem "github-markup"
end

group :debug do
gem "pry"
gem "pry-byebug"
gem "pry-stack_explorer"
end
2 changes: 1 addition & 1 deletion lib/omnibus/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def truncate_platform_version(platform_version, platform)
# than the platform version. Take a look at the following file for the
# details:
#
# https://github.com/opscode/chef/blob/master/lib/chef/win32/version.rb
# https://github.com/chef/chef/blob/master/lib/chef/win32/version.rb
#
# As we don't need to be exact here the simple mapping below is based on:
#
Expand Down
1 change: 0 additions & 1 deletion omnibus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,4 @@ Gem::Specification.new do |gem|
gem.add_development_dependency "webmock"
gem.add_development_dependency "rake"
gem.add_development_dependency "appbundler"
gem.add_development_dependency "pry"
end

0 comments on commit 1c4e4af

Please sign in to comment.