diff options
| author | neha-p6 <neha.pansare@progress.com> | 2022-07-22 19:52:22 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 19:52:22 +0530 |
| commit | 7102e04a23adcf2399e2b3e4ee65dbe3508dcb04 (patch) | |
| tree | 73d3f3d04874dad01a32ef2be7f0c77644caa7ef /omnibus | |
| parent | 0bf13f7da5f9e24c99d6ea5a4e98de0c1e563d71 (diff) | |
| download | chef-7102e04a23adcf2399e2b3e4ee65dbe3508dcb04.tar.gz | |
Revert "Revert "Use new msys2 based devkit for windows" (#13063)" (#13097)
This reverts commit 4797e01535af8e33ace9ef3a7404dd8256913bce.
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/config/projects/chef.rb | 6 | ||||
| -rw-r--r-- | omnibus/omnibus-test.ps1 | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index dd22f4654c..94c0236841 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -62,11 +62,7 @@ dependency "version-manifest" dependency "openssl-customization" # devkit needs to come dead last these days so we do not use it to compile any gems -if windows? - override :"ruby-windows-devkit", version: "4.5.2-20111229-1559" if windows_arch_i386? - dependency "ruby-windows-devkit" - dependency "ruby-windows-devkit-bash" -end +dependency "ruby-msys2-devkit" if windows? dependency "ruby-cleanup" diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index 3b7c99c434..2c4331ff2f 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -69,7 +69,9 @@ If ($lastexitcode -ne 0) { Throw $lastexitcode } & $embedded_bin_dir\rspec.bat --version If ($lastexitcode -ne 0) { Throw $lastexitcode } -$Env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;$Env:PATH" +# We add C:\Program Files\Git\bin to the path to ensure the git bash shell is included +# Omnibus puts C:\Program Files\Git\mingw64\bin which has git.exe but not bash.exe +$Env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;C:\Program Files\Git\bin;$Env:PATH" # Test against the vendored chef gem (cd into the output of "gem which chef") $chefdir = gem which chef |