From e3a7ccba574e0e2a304f4441eeff2b2b7fb56b3c Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Tue, 14 Jun 2022 16:59:38 +0800
Subject: [PATCH] ci/vs2019: Convert mesa_build.ps1 to using PowerShell 7 &&
 operator

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16934>
---
 .gitlab-ci/build/gitlab-ci.yml    |  2 +-
 .gitlab-ci/windows/mesa_build.ps1 | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index bc9fc9a3dfa..75e845a3061 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -413,7 +413,7 @@ windows-vs2019:
     - .windows-build-rules
   stage: build-misc
   script:
-    - . .\.gitlab-ci\windows\mesa_build.ps1
+    - pwsh -ExecutionPolicy RemoteSigned .\.gitlab-ci\windows\mesa_build.ps1
   artifacts:
     paths:
       - _build/meson-logs/*.txt
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 1772b1846d0..6eb9c98660f 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -59,15 +59,9 @@ meson `
 -Dwarning_level=2 `
 -Dzlib:warning_level=1 `
 -Dlibelf:warning_level=1 `
-$sourcedir
-
-if ($?) {
-  meson install --skip-subprojects
-}
-
-if ($?) {
-  meson test --num-processes 32
-}
+$sourcedir && `
+meson install --skip-subprojects && `
+meson test --num-processes 32
 
 $buildstatus = $?
 Pop-Location