Merge pull request #13144 from chef/tp/ruby-revert-to-ruby31

Integrate ruby 3.1 into builds

3 files changed, 26 insertions, 23 deletions

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index ca5e4f2339..77f27b82ab 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,11 @@
 source "https://rubygems.org"
 
 gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
-gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
+
+# FIXME temporarily forcing builds through jfm/ucrt_update brance for omnibus-software
+# gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
+gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: "jfm/ucrt_update"
+
 gem "artifactory"
 
 gem "pedump"
@@ -12,7 +16,7 @@ gem "pedump"
 # by running `bundle config set --local without development && bundle install` to speed up build times.
 group :development do
   # Use Berkshelf for resolving cookbook dependencies
-  gem "berkshelf", ">= 7.0"
+  gem "berkshelf", ">= 8.0"
 
   # Use Test Kitchen with Vagrant for converging the build environment
   gem "test-kitchen", ">= 1.23"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4c542ecf1e..fd8cff7059 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 1d540dcdefae0fa75eb832590e85294e7c26660a
-  branch: main
+  revision: 8b1efa78a0aad9574512253c7082a83fe4070819
+  branch: jfm/ucrt_update
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 9.0.0)
@@ -34,7 +34,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.608.0)
+    aws-partitions (1.610.0)
     aws-sdk-core (3.131.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -47,15 +47,13 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.62.0)
+    aws-sdk-secretsmanager (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    bcrypt_pbkdf (1.1.0-x64-mingw32)
-    bcrypt_pbkdf (1.1.0-x86-mingw32)
-    berkshelf (8.0.1)
+    berkshelf (8.0.2)
       chef (>= 15.7.32)
       chef-config
       cleanroom (~> 1.0)
@@ -240,7 +238,7 @@ GEM
     iso8601 (0.13.0)
     jmespath (1.6.1)
     json (2.6.2)
-    kitchen-vagrant (1.11.0)
+    kitchen-vagrant (1.12.1)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -266,7 +264,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.19)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -295,7 +293,7 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nori (2.6.0)
-    octokit (4.23.0)
+    octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     ohai (17.9.0)
@@ -327,7 +325,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rainbow (3.1.1)
     retryable (3.0.5)
     rexml (3.2.5)
@@ -351,7 +349,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
-    sawyer (0.9.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     semverse (3.0.2)
@@ -366,7 +364,7 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (3.2.2)
+    test-kitchen (3.3.1)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
@@ -413,7 +411,7 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
     vault (0.17.0)
@@ -466,12 +464,13 @@ GEM
 PLATFORMS
   ruby
   x64-mingw
+  x64-mingw-ucrt
   x64-mingw32
   x86-mingw32
 
 DEPENDENCIES
   artifactory
-  berkshelf (>= 7.0)
+  berkshelf (>= 8.0)
   kitchen-vagrant (>= 1.3.1)
   omnibus!
   omnibus-software!
@@ -480,4 +479,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.3.12
+   2.3.18
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 94c0236841..3de79303e8 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"]
@@ -94,8 +94,8 @@ package :msi do
   upgrade_code msi_upgrade_code
   wix_candle_extension "WixUtilExtension"
   wix_light_extension "WixUtilExtension"
-  signing_identity "AF21BA8C9E50AE20DA9907B6E2D4B0CC3306CA03", machine_store: true
-  parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-mingw32/ext/win32-eventlog/chef-log.dll")),
+  signing_identity "13B510D1CF1B3467856A064F1BEA12D0884D2528", machine_store: true
+  parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-x64-mingw-ucrt/ext/win32-eventlog/chef-log.dll")),
              ProjectLocationDir: project_location_dir
 end