summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortpowell-progress <104777878+tpowell-progress@users.noreply.github.com>2022-09-08 09:47:04 -0400
committerGitHub <noreply@github.com>2022-09-08 09:47:04 -0400
commitf3222ac6df62c047c2610bd057455a3f17a4e6c7 (patch)
treea7e420e55b7895e4f743242a3bfbbb7b8b4bda5e
parentaf2813a5fe1ce014967ad7833075ac5bf831b8d4 (diff)
downloadchef-f3222ac6df62c047c2610bd057455a3f17a4e6c7.tar.gz
Bundle with for 2.3.7 and cleanup with minimal gem bumps (#13169)
* Add ruby cleanup * Disable Amazon 2022 and Windows 8 pipelines Signed-off-by: tpowell-progress <104777878+tpowell-progress@users.noreply.github.com>
-rw-r--r--.expeditor/release.omnibus.yml10
-rw-r--r--omnibus/config/projects/chef.rb4
2 files changed, 7 insertions, 7 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/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 3de79303e8..217170ffef 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -64,10 +64,10 @@ dependency "openssl-customization"
# devkit needs to come dead last these days so we do not use it to compile any gems
dependency "ruby-msys2-devkit" if windows?
-# dependency "ruby-cleanup"
+dependency "ruby-cleanup"
# further gem cleanup other projects might not yet want to use
-# dependency "more-ruby-cleanup"
+dependency "more-ruby-cleanup"
package :rpm do
signing_passphrase ENV["OMNIBUS_RPM_SIGNING_PASSPHRASE"]