Mesa (main): ci/windows: add back build-error detection

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 10 13:49:59 UTC 2022


Module: Mesa
Branch: main
Commit: 003d05281011b77b24e56d9168d3104ea8ebe021
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=003d05281011b77b24e56d9168d3104ea8ebe021

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jun  8 18:07:43 2022 +0200

ci/windows: add back build-error detection

This was accidentally broken while refactoring the script.

Fixes: bf3c772e5e5 ("ci: Improve vs2019 mesa_build.ps1 for remove the need of cmd.exe")
Reviewed-by: Yonggang Luo <luoyonggang at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16965>

---

 .gitlab-ci/windows/mesa_build.ps1 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 885069204e2..6c0ebab9112 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -45,8 +45,13 @@ meson --default-library=shared -Dzlib:default_library=static --buildtype=release
 -Dbuild-tests=true -Dwerror=true -Dwarning_level=2 -Dzlib:warning_level=1 -Dlibelf:warning_level=1 `
 $sourcedir
 
-ninja install -j32
-meson test --num-processes 32
+if ($?) {
+  ninja install -j32
+}
+
+if ($?) {
+  meson test --num-processes 32
+}
 
 $buildstatus = $?
 Pop-Location



More information about the mesa-commit mailing list