diff options
| author | John McCrae <john.mccrae@progress.com> | 2023-04-26 23:52:20 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 23:52:20 +0600 |
| commit | 7a9d84e3338e06806129fc2f0f95b9e747a8cd76 (patch) | |
| tree | 6eaf734a48d710f22510c4b6ed38d60d54a82bd7 | |
| parent | 13a19f53a8e2acfbe995af5bf0e677f1d89e3ae8 (diff) | |
| parent | 3576da06b766c6b252118976dba7757009d2cbd6 (diff) | |
| download | chef-7a9d84e3338e06806129fc2f0f95b9e747a8cd76.tar.gz | |
Merge pull request #13715 from chef/jfm/chef17_knife_gem
[Chef-17] 13 of X - Updated Knife for Chef-17
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | knife/knife.gemspec | 8 |
4 files changed, 7 insertions, 6 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 20b3496197..9ef977108d 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -348,7 +348,7 @@ steps: - bundle config set --local without omnibus_package - bundle config set --local path 'vendor/bundle' - bundle install --jobs=3 --retry=3 - - bundle exec tasks/bin/run_external_test chef/knife-windows main rake spec + - bundle exec tasks/bin/run_external_test chef/knife-windows chef-17 rake spec expeditor: executor: docker: diff --git a/CHANGELOG.md b/CHANGELOG.md index 946b7082cd..d2d3c52fa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). + <!-- latest_release 17.10.54 --> ## [v17.10.54](https://github.com/chef/chef/tree/v17.10.54) (2023-04-26) @@ -1 +1 @@ -17.10.54
\ No newline at end of file +17.10.54 diff --git a/knife/knife.gemspec b/knife/knife.gemspec index ad7cfaf230..69a6566f83 100644 --- a/knife/knife.gemspec +++ b/knife/knife.gemspec @@ -13,11 +13,11 @@ Gem::Specification.new do |s| s.email = "adam@chef.io" # These seem a bit out of date, and this address probably doesn't go anywhere anymore? s.homepage = "https://www.chef.io" - s.required_ruby_version = ">= 2.7.0" + s.required_ruby_version = ">= 2.7.0", "< 3.1" - s.add_dependency "chef-config", ">= #{Chef::Knife::VERSION.split(".").first}" - s.add_dependency "chef-utils", ">= #{Chef::Knife::VERSION.split(".").first}" - s.add_dependency "chef", ">= #{Chef::Knife::VERSION.split(".").first}" + s.add_dependency "chef-config", ">= #{Chef::Knife::VERSION.split(".").first}", "< 18.0" + s.add_dependency "chef-utils", ">= #{Chef::Knife::VERSION.split(".").first}", "< 18.0" + s.add_dependency "chef", ">= #{Chef::Knife::VERSION.split(".").first}", "< 18.0" s.add_dependency "train-core", "~> 3.10" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635 s.add_dependency "train-winrm", ">= 0.2.5" s.add_dependency "license-acceptance", ">= 1.0.5", "< 3" |