diff options
| author | Garrett Brown <themagnificentmrb@gmail.com> | 2024-01-24 18:26:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 18:26:24 -0800 |
| commit | aec8e37fc02285eb4a1d665c6471088165ddff7b (patch) | |
| tree | 084fceae7a1d877a3fa78ec77d806ded4e2da602 | |
| parent | d527c92cc39963f660c610296b6a49076b1fee9f (diff) | |
| parent | 80c204e421be9e6e53797ffe96230d2747f59a4a (diff) | |
Merge pull request #24568 from garbear/backport-kill-dirmngr
[Backport] Add another msys2 binary to fix game add-on build failures
| -rw-r--r-- | tools/buildsteps/windows/prepare-env.bat | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/buildsteps/windows/prepare-env.bat b/tools/buildsteps/windows/prepare-env.bat index 36625beb99..bcbaded7f9 100644 --- a/tools/buildsteps/windows/prepare-env.bat +++ b/tools/buildsteps/windows/prepare-env.bat @@ -13,7 +13,8 @@ IF EXIST %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 rmdir %WORKSPACE%\proje rem also clean 'build' dir used to build ffmpeg as git clean has trouble to remove some times IF EXIST %WORKSPACE%\project\BuildDependencies\build rmdir %WORKSPACE%\project\BuildDependencies\build /S /Q -rem daemonized gpg-agent blocks mingw from being cleaned with git +rem daemonized executables block mingw from being cleaned with git +TASKKILL /IM "dirmngr.exe" /F >nul 2>&1 TASKKILL /IM "gpg-agent.exe" /F >nul 2>&1 rem we assume git in path as this is a requirement |