Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .expeditor/run_linux_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export LANG=C.UTF-8 LANGUAGE=C.UTF-8

echo "--- bundle install"
bundle config --local path vendor/bundle
bundle config --local without debug
bundle install --jobs=7 --retry=3

echo "+++ bundle exec task"
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/run_windows_tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ If ($lastexitcode -ne 0) { Exit $lastexitcode }

Write-Output "--- Bundle Execute"

bundle exec rake
bundle exec rake
If ($lastexitcode -ne 0) { Exit $lastexitcode }
1 change: 0 additions & 1 deletion .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ expeditor:
timeout_in_minutes: 30

steps:

- label: run-specs-ruby-2.7
command:
- .expeditor/run_linux_tests.sh rake
Expand Down
12 changes: 2 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ source "https://rubygems.org"

gemspec

gem "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we leave this as well?


group :test do
gem "rake"
gem "rspec"
gem "webrick"
gem "webmock", "~> 3.4"
gem "contracts", "~> 0.16.0" # this entry can go away when ruby < 3 support is gone
if RUBY_VERSION < "2.6.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably wanna leave the conditional here....

gem "climate_control", "= 0.1.0"
gem "vcr", "= 6.0.0"
gem "mixlib-shellout", "= 3.2.5"
else
gem "climate_control", "~> 1.0"
gem "vcr"
end
gem "climate_control", "~> 1.0"
gem "vcr"
end

# use old chefstyle to support TargetRubyVersion of 1.9
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@

## Supports

- Ruby 1.9.3+
- Chef 11.6.2+ chef-client upgrades
- Ruby 2.6+
- Chef 14+ chef-client upgrades
- To upgrade older versions of chef-client, it will be necessary to use older versions of mixlib-install that are compatible with versions of ruby prior to 2.6.

## Command Line Usage
```
Expand Down
2 changes: 1 addition & 1 deletion mixlib-install.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.files = %w{LICENSE Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,support}/**/*")
spec.executables = ["mixlib-install"]
spec.require_paths = ["lib"]

spec.required_ruby_version = ">= 2.6.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we decided not to force newer versions so people can use this on like an old Mac to get the latest chef... we wanted to go "soft" min requirement.

spec.add_dependency "mixlib-shellout"
spec.add_dependency "mixlib-versioning"
spec.add_dependency "thor"
Expand Down