From e4da9d825430907c83f500b74064db9d91367a72 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Wed, 8 Jun 2022 18:07:43 +0200
Subject: [PATCH] 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@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16965>
(cherry picked from commit 003d05281011b77b24e56d9168d3104ea8ebe021)
---
 .gitlab-ci/windows/mesa_build.ps1 | 9 +++++++--
 .pick_status.json                 | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 46a18666f0d..e4427a7c207 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -40,8 +40,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
diff --git a/.pick_status.json b/.pick_status.json
index 2dbf26d0dbf..382628062e0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -679,7 +679,7 @@
         "description": "ci/windows: add back build-error detection",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "bf3c772e5e5854d60dcddceb29a6849701423320"
     },