From 855fdddfe8cf14c9897957a00a91c65d34eacbd4 Mon Sep 17 00:00:00 2001 From: Evan Ahlberg Date: Wed, 25 Jan 2023 11:22:28 -0500 Subject: 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 --- omnibus/config/projects/chef.rb | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'omnibus') 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" -- cgit v1.2.1