summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorEvan Ahlberg <evanahlberg@gmail.com>2023-01-25 11:22:28 -0500
committerGitHub <noreply@github.com>2023-01-25 11:22:28 -0500
commit855fdddfe8cf14c9897957a00a91c65d34eacbd4 (patch)
treea83c01f6033960438d94bd0e7a49fdef58481b64 /omnibus
parentb98c274340431be832a178a29530827f62f1d825 (diff)
downloadchef-855fdddfe8cf14c9897957a00a91c65d34eacbd4.tar.gz
revert chef-foundation changes in chef omnibus config (#13528)
* revert chef-foundation changes in chef omnibus config * change fips test for windows * update pipeline names to validate and increase timeout for windows omnibus builds * remove omnibus build and test for now Signed-off-by: Evan Ahlberg <evanahlberg@gmail.com>
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/config/projects/chef.rb24
1 files changed, 23 insertions, 1 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 2cb807f887..10f7f25b15 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -45,7 +45,29 @@ override :chef, version: "local_source"
overrides_path = File.expand_path("../../../../omnibus_overrides.rb", current_file)
instance_eval(IO.read(overrides_path), overrides_path)
-dependency "chef-local-source"
+dependency "preparation"
+# dependency "chef-local-source"
+
+dependency "chef"
+
+#
+# addons which require omnibus software defns (not direct deps of chef itself - RFC-063)
+#
+dependency "nokogiri" # (nokogiri cannot go in the Gemfile, see wall of text in the software defn)
+
+# FIXME?: might make sense to move dependencies below into the omnibus-software chef
+# definition or into a chef-complete definition added to omnibus-software.
+dependency "gem-permissions"
+dependency "shebang-cleanup"
+dependency "version-manifest"
+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"
+
+# further gem cleanup other projects might not yet want to use
dependency "more-ruby-cleanup"