diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh index fc2f6b2b..e8dc6be7 100755 --- a/.expeditor/run_linux_tests.sh +++ b/.expeditor/run_linux_tests.sh @@ -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" diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index faf85ae8..9e943a44 100644 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -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 } diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 19ca7f91..97875cfd 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -10,7 +10,6 @@ expeditor: timeout_in_minutes: 30 steps: - - label: run-specs-ruby-2.7 command: - .expeditor/run_linux_tests.sh rake diff --git a/Gemfile b/Gemfile index f315bf97..2215f1b9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,22 +2,14 @@ source "https://rubygems.org" gemspec -gem "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0" - 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" - 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 diff --git a/README.md b/README.md index 0d710056..75a3ca99 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/mixlib-install.gemspec b/mixlib-install.gemspec index e7b607f5..c63715d5 100644 --- a/mixlib-install.gemspec +++ b/mixlib-install.gemspec @@ -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" spec.add_dependency "mixlib-shellout" spec.add_dependency "mixlib-versioning" spec.add_dependency "thor"