diff options
| author | Garrett Brown <themagnificentmrb@gmail.com> | 2024-01-22 17:01:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 17:01:50 -0800 |
| commit | 4848feb98ae5ee57bcb409a15e83ce8a0b45ef28 (patch) | |
| tree | 0eebfe56003b434f8b22660ffdf5e1f2d576361e | |
| parent | ec5fff32835210b9c8bc1b74ab57681ca895d7b6 (diff) | |
| parent | 72809d354d949ffc886c175e3a507032bff0df87 (diff) | |
Merge pull request #24562 from garbear/backport-kill-gpg-agent
[Backport] Fix the scourge of game add-on build failures
| -rw-r--r-- | tools/buildsteps/windows/prepare-env.bat | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/buildsteps/windows/prepare-env.bat b/tools/buildsteps/windows/prepare-env.bat index c739726bf2..36625beb99 100644 --- a/tools/buildsteps/windows/prepare-env.bat +++ b/tools/buildsteps/windows/prepare-env.bat @@ -13,11 +13,14 @@ 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 +TASKKILL /IM "gpg-agent.exe" /F >nul 2>&1 + rem we assume git in path as this is a requirement rem git clean the untracked files and directories rem but keep the downloaded dependencies rem also keeps MSYS2 installation -SET GIT_CLEAN_CMD=git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/BuildDependencies/msys64" -e "project/BuildDependencies/tools" +SET GIT_CLEAN_CMD=git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/BuildDependencies/msys64" -e "project/BuildDependencies/tools" -e "cmake/addons/build/download/msys2-base-*.tar.xz" ECHO running %GIT_CLEAN_CMD% %GIT_CLEAN_CMD% |