diff options
| author | neha-p6 <neha.pansare@progress.com> | 2022-07-11 16:24:26 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-11 16:24:26 +0530 |
| commit | 4797e01535af8e33ace9ef3a7404dd8256913bce (patch) | |
| tree | 62316be0357fea8b6b05347e4e502242c841c2e8 /omnibus | |
| parent | ae13bc5695119051eea89d8b313821103850a1d7 (diff) | |
| download | chef-4797e01535af8e33ace9ef3a7404dd8256913bce.tar.gz | |
Revert "Use new msys2 based devkit for windows" (#13063)
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/config/projects/chef.rb | 6 | ||||
| -rw-r--r-- | omnibus/omnibus-test.ps1 | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 94c0236841..dd22f4654c 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -62,7 +62,11 @@ 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? +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-cleanup" diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index 2c4331ff2f..3b7c99c434 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -69,9 +69,7 @@ If ($lastexitcode -ne 0) { Throw $lastexitcode } & $embedded_bin_dir\rspec.bat --version If ($lastexitcode -ne 0) { Throw $lastexitcode } -# 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" +$Env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;$Env:PATH" # Test against the vendored chef gem (cd into the output of "gem which chef") $chefdir = gem which chef |