Skip to content

Commit 8e51e65

Browse files
committed
PR build (run the installer): do validate the correct installation
When we just installed the 32-bit variant of Git for Windows, we would really actually like to validate that one, not the 64-bit installation that comes as part of the hosted GitHub Actions runners. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent d034bbb commit 8e51e65

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,13 @@ jobs:
192192
Write-Host "::error::Installer failed with exit code $exitCode!"
193193
exit 1
194194
}
195-
"$env:ProgramFiles\Git\usr\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
196-
"$env:ProgramFiles\Git\mingw${{env.ARCH_BITNESS}}\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
195+
if ("${{ matrix.bitness }}" -eq 32) {
196+
"${env:ProgramFiles(x86)}\Git\usr\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
197+
"${env:ProgramFiles(x86)}\Git\mingw32\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
198+
} else {
199+
"$env:ProgramFiles\Git\usr\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
200+
"$env:ProgramFiles\Git\mingw${{env.ARCH_BITNESS}}\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
201+
}
197202
- name: validate
198203
if: matrix.artifact == 'build-installers'
199204
shell: bash

0 commit comments

Comments
 (0)