Skip to content

Commit

Permalink
Merge pull request #936 from chef/dependabot/bundler/chefstyle-eq-0.15.1
Browse files Browse the repository at this point in the history
Update chefstyle requirement from = 0.14.1 to = 0.15.1
  • Loading branch information
tas50 authored Apr 16, 2020
2 parents f389917 + dd93d04 commit af116e7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .expeditor/run_linux_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ else
fi

echo "+++ bundle exec task"
bundle exec $1
bundle exec $@
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Layout/ClosingHeredocIndentation:
Exclude:
- 'lib/omnibus/licensing.rb'

Layout/IndentHeredoc:
Layout/HeredocIndentation:
Exclude:
- 'lib/omnibus/licensing.rb'

Expand Down
4 changes: 2 additions & 2 deletions lib/omnibus/compressor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ def for_current_system(compressors)
end

if compressors.include?(:tgz)
return TGZ
TGZ
else
log.info(log_key) { "No compressor defined for `#{family}'." }
return Null
Null
end
end
module_function :for_current_system
Expand Down
2 changes: 1 addition & 1 deletion omnibus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |gem|

gem.add_development_dependency "artifactory", "~> 3.0"
gem.add_development_dependency "aruba", "~> 0.5"
gem.add_development_dependency "chefstyle", "= 0.14.1"
gem.add_development_dependency "chefstyle", "= 0.15.1"
gem.add_development_dependency "fauxhai", ">= 5.2"
gem.add_development_dependency "rspec", "~> 3.0"
gem.add_development_dependency "rspec-json_expectations"
Expand Down

0 comments on commit af116e7

Please sign in to comment.