summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-09-08 18:23:18 -0700
committerGitHub <noreply@github.com>2022-09-08 18:23:18 -0700
commit634ae67ad98af7c5ed62da694c5106e613668405 (patch)
tree8b597d901317f46f3d1ee7c2626dc734ed3cf2f3
parent69100cecb1e23ab45d850398ebc6b5e1b92be220 (diff)
parentf4fad6a2cad985a1ac891091c7e37703eab04546 (diff)
downloadchef-jfm/chef18_rc1.tar.gz
Merge branch 'main' into jfm/chef18_rc1jfm/chef18_rc1
-rw-r--r--.expeditor/release.omnibus.yml10
-rwxr-xr-x.expeditor/update_version.sh1
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock16
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--knife/lib/chef/knife/version.rb2
-rw-r--r--lib/chef/version.rb2
10 files changed, 24 insertions, 22 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 98cc101e11..35be8a9ec8 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -16,10 +16,10 @@ builder-to-testers-map:
- aix-7.1-powerpc
- aix-7.2-powerpc
- aix-7.3-powerpc
- amazon-2022-aarch64:
- - amazon-2022-aarch64
- amazon-2022-x86_64:
- - amazon-2022-x86_64
+ # amazon-2022-aarch64:
+ # - amazon-2022-aarch64
+ # amazon-2022-x86_64:
+ # - amazon-2022-x86_64
debian-9-x86_64:
- debian-9-x86_64
- debian-10-x86_64
@@ -87,7 +87,7 @@ builder-to-testers-map:
- windows-2016-x86_64
- windows-2019-x86_64
- windows-2022-x86_64
- - windows-8-x86_64
+ # - windows-8-x86_64
- windows-10-x86_64
- windows-11-x86_64
diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
index 95840cadfc..d8cc70e418 100755
--- a/.expeditor/update_version.sh
+++ b/.expeditor/update_version.sh
@@ -18,6 +18,7 @@ sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-bin/lib/ch
sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-utils/lib/chef-utils/version.rb
sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" knife/lib/chef/knife/version.rb
sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"${VERSION}\")/" lib/chef/version.rb
+asdf global ruby "3.1.0"
# Update the version inside Gemfile.lock
bundle update chef chef-config chef-utils --jobs=7 --conservative
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01be44c259..96272c90f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,18 @@
<!-- 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 18.0.142 -->
-## [v18.0.142](https://github.com/chef/chef/tree/v18.0.142) (2022-08-30)
+<!-- latest_release 18.0.143 -->
+## [v18.0.143](https://github.com/chef/chef/tree/v18.0.143) (2022-09-08)
#### Merged Pull Requests
-- Add empty pipeline for macos universal package [#13152](https://github.com/chef/chef/pull/13152) ([vkarve-chef](https://github.com/vkarve-chef))
+- The worker container for expeditor needs to use Ruby 3.1.0 [#13171](https://github.com/chef/chef/pull/13171) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
<!-- latest_release -->
<!-- release_rollup since=17.9.26 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- The worker container for expeditor needs to use Ruby 3.1.0 [#13171](https://github.com/chef/chef/pull/13171) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit)) <!-- 18.0.143 -->
- Add empty pipeline for macos universal package [#13152](https://github.com/chef/chef/pull/13152) ([vkarve-chef](https://github.com/vkarve-chef)) <!-- 18.0.142 -->
- Add newline to end of sysctl files [#13118](https://github.com/chef/chef/pull/13118) ([tmccombs](https://github.com/tmccombs)) <!-- 18.0.141 -->
- fix chef_client_scheduled_task splay to accept 0 [#13095](https://github.com/chef/chef/pull/13095) ([Stromweld](https://github.com/Stromweld)) <!-- 18.0.140 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 77717c0959..8822d7e84a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,12 +53,12 @@ GIT
PATH
remote: .
specs:
- chef (18.0.142)
+ chef (18.0.143)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 18.0.142)
- chef-utils (= 18.0.142)
+ chef-config (= 18.0.143)
+ chef-utils (= 18.0.143)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -90,15 +90,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (18.0.142)
- chef (= 18.0.142)
+ chef-bin (18.0.143)
+ chef (= 18.0.143)
PATH
remote: chef-config
specs:
- chef-config (18.0.142)
+ chef-config (18.0.143)
addressable
- chef-utils (= 18.0.142)
+ chef-utils (= 18.0.143)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -107,7 +107,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (18.0.142)
+ chef-utils (18.0.143)
concurrent-ruby
GEM
diff --git a/VERSION b/VERSION
index e756675b00..2db67b5511 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.142 \ No newline at end of file
+18.0.143 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 5f1a2e3211..571777ad53 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("..", __dir__)
- VERSION = "18.0.142".freeze
+ VERSION = "18.0.143".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 7799607e56..e7a67ebb46 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
- VERSION = "18.0.142".freeze
+ VERSION = "18.0.143".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 8c867bd068..516dee87af 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "18.0.142"
+ VERSION = "18.0.143"
end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 3b53b1177e..03d37c45f2 100644
--- a/knife/lib/chef/knife/version.rb
+++ b/knife/lib/chef/knife/version.rb
@@ -17,7 +17,7 @@
class Chef
class Knife
KNIFE_ROOT = File.expand_path("../..", __dir__)
- VERSION = "18.0.142".freeze
+ VERSION = "18.0.143".freeze
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a95964f938..746750cdb7 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("..", __dir__)
- VERSION = Chef::VersionString.new("18.0.142")
+ VERSION = Chef::VersionString.new("18.0.143")
end
#