Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update chefstyle requirement from = 0.14.1 to = 0.15.1 #936

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Update chefstyle requirement from = 0.14.1 to = 0.15.1 #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10282b6
Update chefstyle requirement from = 0.14.1 to = 0.15.1
dependabot-preview[bot] Mar 26, 2020
dd93d04
Updates for Chefstyle 0.15
tas50 Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .expeditor/run_linux_tests.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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