git.exe: add /cmd folder to PATH when calling bash.exe

Author: dennisameling

.jest/setEnvVars.ts

@@ -0,0 +1,5 @@
+/*
+This ensures that the PATH of the machine that the tests are running on,
+doesn't leak into our tests.
+*/
+process.env.PATH = ''

dist/index.js

@@ -1,6 +1,7 @@
 module.exports = {
   clearMocks: true,
   moduleFileExtensions: ['js', 'ts'],
+  setupFiles: ["<rootDir>/.jest/setEnvVars.ts"],
   testEnvironment: 'node',
   testMatch: ['**/*.test.ts'],
   testRunner: 'jest-circus/runner',

dist/index.js.map

@@ -48,7 +48,13 @@ describe('git', () => {
         `--architecture=${architecture}`,
         `--out=${outputDirectory}`
       ]),
-      expect.any(Object)
+      expect.objectContaining({
+        env: expect.objectContaining({
+          // We want to ensure that the /cmd folder is in the PATH,
+          // so that please.sh can find git.exe
+          PATH: expect.stringContaining('/cmd')
+        })
+      })
     )
   })
 

jest.config.js

@@ -12,7 +12,8 @@ const gitRoot = fs.existsSync(externalsGitDir)
   : gitForWindowsRoot
 
 export const gitForWindowsUsrBinPath = `${gitRoot}/usr/bin`
-const gitExePath = `${gitRoot}/cmd/git.exe`
+const gitCmdPath = `${gitRoot}/cmd`
+const gitExePath = `${gitCmdPath}/git.exe`
 
 /*
  * It looks a bit ridiculous to use 56 workers on a build agent that has only
@@ -204,7 +205,7 @@ export async function getViaGit(
               LC_CTYPE: 'C.UTF-8',
               CHERE_INVOKING: '1',
               MSYSTEM: 'MINGW64',
-              PATH: `${gitForWindowsUsrBinPath}${delimiter}${process.env.PATH}`
+              PATH: `${gitCmdPath}${delimiter}${gitForWindowsUsrBinPath}${delimiter}${process.env.PATH}`
             },
             stdio: [undefined, 'inherit', 'inherit']
           }