From 7102e04a23adcf2399e2b3e4ee65dbe3508dcb04 Mon Sep 17 00:00:00 2001 From: neha-p6 Date: Fri, 22 Jul 2022 19:52:22 +0530 Subject: Revert "Revert "Use new msys2 based devkit for windows" (#13063)" (#13097) This reverts commit 4797e01535af8e33ace9ef3a7404dd8256913bce. --- omnibus/omnibus-test.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'omnibus/omnibus-test.ps1') 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 -- cgit v1.2.1