updating the windows platform from omnibus

Signed-off-by: John McCrae <john.mccrae@progress.com>

7 files changed, 12 insertions, 75 deletions

diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
index c8a483544a..716de60cf8 100644
--- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1
+++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
@@ -1,7 +1,6 @@
 [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0]
 if ($hab_version -lt [Version]"0.85.0" ) {
     Write-Host "--- :habicat: Installing the version of Habitat required"
-    # install-habitat --version 0.85.0.20190916
     Set-ExecutionPolicy Bypass -Scope Process -Force
     Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1'))
     if (-not $?) { throw "Hab version is older than 0.85 and could not update it." }
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index c3d55e641d..50698e6fba 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -29,11 +29,11 @@ jobs:
           $ErrorActionPreference = 'Stop';
           Write-Output 'Downloading Ruby + DevKit';
           [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
-          (New-Object System.Net.WebClient).DownloadFile($pkg_source, 'c:\rubyinstaller-devkit-3.1.2-1-x64.exe');
+          (New-Object System.Net.WebClient).DownloadFile($pkg_source, 'c:\rubyinstaller-devkit-$pkg_version-$pkg_revision-x64.exe');
           Write-Output 'Installing Ruby + DevKit';
-          Start-Process c:\rubyinstaller-devkit-3.1.2-1-x64.exe -ArgumentList '/verysilent /dir=C:\ruby31' -Wait ;
+          Start-Process c:\rubyinstaller-devkit-$pkg_version-$pkg_revision-x64.exe -ArgumentList '/verysilent /dir=C:\ruby31' -Wait ;
           Write-Output 'Cleaning up installation';
-          Remove-Item c:\rubyinstaller-devkit-3.1.2-1-x64.exe -Force;
+          Remove-Item c:\rubyinstaller-devkit-$pkg_version-$pkg_revision-x64.exe -Force;
           Write-Output "Installing URU to manage Ruby Versions"
           choco install 7zip -y
           Write-Output "Downloading Uru Installer..."
@@ -94,13 +94,13 @@ jobs:
       run: |
         cd kitchen-tests
         $env:PATH = "C:\ruby31\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
-        # # htmldiff and ldiff on windows cause a conflict with gems being loaded below.
-        # # we remove thenm here.
-        # if (Test-Path C:\opscode\chef\embedded\bin\htmldiff)
-        # {
-        #     Remove-Item -Path C:\opscode\chef\embedded\bin\htmldiff
-        #     Remove-Item -Path C:\opscode\chef\embedded\bin\ldiff
-        # }
+        # htmldiff and ldiff on windows cause a conflict with gems being loaded below.
+        # we remove thenm here.
+        if (Test-Path C:\opscode\chef\embedded\bin\htmldiff)
+        {
+            Remove-Item -Path C:\opscode\chef\embedded\bin\htmldiff
+            Remove-Item -Path C:\opscode\chef\embedded\bin\ldiff
+        }
 
         bundle install --jobs=3 --retry=3
         # If ($lastexitcode -ne 0) { Exit $lastexitcode }
@@ -145,10 +145,6 @@ jobs:
         echo "finished updating Bundler, now getting the version"
         /opt/chef/embedded/bin/bundle -v
         echo "finished getting the bundler version"
-    # - name: 'Upgrade Chef/Ohai via Appbundler'
-    #   id: upgrade
-    #   run: |
-    #     OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock)
     - name: 'Run end_to_end::default recipe'
       id: run
       run: |
diff --git a/Gemfile b/Gemfile
index 9b17fe8aa2..f9ecdd4f2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,17 +4,7 @@ gem "chef", path: "."
 
 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 
-# gem "rest-client", :github => "chef/rest-client", :branch => "jfm/ucrt_update"
 gem "ffi", ">= 1.15.5"
-# group(:ffi) do
-#   instance_eval(gem install ffi -v '1.15.5' --source "https://rubygems.org/")
-# end
-
-# if RUBY_PLATFORM == "x64-mingw-ucrt"
-#   gem "chef-powershell", git: "https://github.com/chef/chef-powershell-shim.git", branch: "jfm/json_bug_fix"
-#   gem "win32-api", git: "https://github.com/cosmo0920/win32-api", branch: "master"
-# end
-
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 43d81fdd07..8e4092bc34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,40 +32,6 @@ PATH
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
       chef-config (= 18.0.139)
-      chef-utils (= 18.0.139)
-      chef-vault
-      chef-zero (>= 14.0.11)
-      corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
-      erubis (~> 2.7)
-      ffi (>= 1.5.0)
-      ffi-libarchive (~> 1.0, >= 1.0.3)
-      ffi-yajl (~> 2.2)
-      iniparse (~> 1.4)
-      inspec-core (~> 4.23)
-      license-acceptance (>= 1.0.5, < 3)
-      mixlib-archive (>= 0.4, < 2.0)
-      mixlib-authentication (>= 2.1, < 4)
-      mixlib-cli (>= 2.1.1, < 3.0)
-      mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
-      net-ftp
-      net-sftp (>= 2.1.2, < 4.0)
-      ohai (~> 18.0)
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
-      train-rest (>= 0.4.1)
-      train-winrm (>= 0.2.5)
-      unf_ext (< 0.0.8.1)
-      uuidtools (>= 2.1.5, < 3.0)
-      vault (~> 0.16)
-    chef (18.0.139-universal-mingw32)
-      addressable
-      aws-sdk-s3 (~> 1.91)
-      aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.139)
       chef-powershell (~> 1.0.12)
       chef-utils (= 18.0.139)
       chef-vault
diff --git a/Rakefile b/Rakefile
index bb1a3dd15f..ae451c347a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -62,10 +62,7 @@ end
 # hack in all the preinstall tasks to occur before the traditional install task
 task install: "pre_install:all"
 
-# make sure we build the correct gemspec on windows
-gemspec = Gem.win_platform? ? "chef-universal-mingw-ucrt" : "chef"
-# require "pry"
-# binding.pry
+gemspec = "chef"
 Bundler::GemHelper.install_tasks name: gemspec
 
 # this gets appended to the normal bundler install helper
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index ad2bef131b..4b37b27e59 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -96,18 +96,6 @@ function Invoke-Build {
             try {
                 Push-Location $git_gem
                 Write-BuildLine " -- installing $git_gem"
-
-                # # jfm debugging
-                # if($git_gem -match "chefstyle"){
-                #     gem environment
-                #     $stylers = Get-childitem -path c:\ -File chefstyle.bat -Recurse -ErrorAction SilentlyContinue
-                #     Write-Output "Here are all the chefstyle instances:"
-                #     foreach($styler in $stylers){
-                #         Write-Output $styler.FullName
-                #         gem install $styler.FullName --backtrace
-                #     }
-                # }
-
                 rake install $git_gem --trace=stdout # this needs to NOT be 'bundle exec'd else bundler complains about dev deps not being installed
                 if (-not $?) { throw "unable to install $($git_gem) as a plain old gem" }
             } finally {
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index ca019fded4..3bd6af7bf5 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -22,6 +22,7 @@ override "openssl", version: mac_os_x? ? "1.1.1m" : "1.0.2zb"
 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 "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.11"