Adjusting Windows builds and now removing builders we don't use anymore

.expeditor/config.yml

@@ -50,6 +50,8 @@ release_branches:
       version_constraint: "1.*"
   - 2-stable:
       version_constraint: "2.*"
+  - 3-stable:
+      version_constraint: "3.1.*"
 
 subscriptions:
   # These actions are taken, in order they are specified, anytime a Pull Request is merged.

.expeditor/release.omnibus.yml

@@ -51,11 +51,11 @@ builder-to-testers-map:
     - el-9-aarch64
   el-9-x86_64:
     - el-9-x86_64
-  freebsd-12-amd64:
-    - freebsd-12-amd64
+  freebsd-13-amd64:
+    # - freebsd-12-amd64
     - freebsd-13-amd64
-  mac_os_x-10.15-x86_64:
-    - mac_os_x-10.15-x86_64
+  mac_os_x-11-x86_64:
+    # - mac_os_x-10.15-x86_64
     - mac_os_x-11-x86_64
     - mac_os_x-12-x86_64
   mac_os_x-11-arm64:
@@ -90,9 +90,9 @@ builder-to-testers-map:
     - ubuntu-18.04-x86_64
     - ubuntu-20.04-x86_64
     - ubuntu-22.04-x86_64
-  windows-2012r2-x86_64:
-    - windows-2012-x86_64
-    - windows-2012r2-x86_64
+  windows-2016-x86_64:
+    # - windows-2012-x86_64
+    # - windows-2012r2-x86_64
     - windows-2016-x86_64
     - windows-2019-x86_64
     - windows-2022-x86_64

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: d357d5cf84dce2b99b28093c4a5c32f2f96b4787
+  revision: 8233b4242227b9e5c11a53b6290d1b44715758fe
   branch: main
   specs:
-    omnibus-software (23.11.307)
+    omnibus-software (24.4.320)
       omnibus (>= 9.0.0)
 
 GIT
@@ -475,7 +475,7 @@ GEM
     vault (0.17.0)
       aws-sigv4
     webrick (1.8.1)
-    win32-api (1.10.1-universal-mingw32)
+    win32-api (1.10.1)
     win32-certstore (0.6.15)
       chef-powershell (>= 1.0.12)
       ffi

config/projects/chef-foundation.rb

@@ -33,6 +33,7 @@
   # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
   #       Native gems will use gcc which will barf on files with spaces,
   #       which is only fixable if everyone in the world fixes their Makefiles
+  system("gem uninstall -I libyajl2")
   install_dir  "#{default_root}/opscode/chef"
   package_name name
 else

omnibus_overrides.rb

@@ -14,6 +14,10 @@
   # Chef Infra Cilent failed to install on Solaris V11.4.47 - CHEF-7695
   override :bash, version: "5.1.8"
 end
+# libxml2 version - 2.10.4 fails on freebsd 13 hence pinned to 2.11.7
+if freebsd?
+  override :libxml2, version: "2.11.7"
+end
 override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "6.3"
@@ -22,7 +26,7 @@
 override "pkg-config-lite", version: "0.28-1"
 override :ruby, version: aix? ? "3.0.3" : "3.1.2"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
-override "ruby-msys2-devkit", version: "3.1.2-1"
+override "ruby-msys2-devkit", version: "3.1.5-1"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.11"