From 268b697de4bbb7869de8811684616372def4f4c0 Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Mon, 28 Aug 2023 17:53:25 +0200
Subject: [PATCH] Wait for MSI to finish

---
 .gitlab/ci/build.gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml
index 9169bf803..38ab080e9 100644
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@@ -41,11 +41,9 @@ build:windows_cpp:
   image: mcr.microsoft.com/windows/servercore:ltsc2022
   before_script:
     - Invoke-WebRequest -UseBasicParsing "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-x86_64.msi" -o cmake-3.27.4-windows-x86_64.msi
-    - MsiExec.exe /i cmake-3.27.4-windows-x86_64.msi ADD_CMAKE_TO_PATH=System /qn
+    - start /wait MsiExec.exe /i cmake-3.27.4-windows-x86_64.msi ADD_CMAKE_TO_PATH=System /qn
     - Invoke-WebRequest -UseBasicParsing "https://aka.ms/vs/17/release/vs_buildtools.exe" -o vs_buildtools.exe
-    - .\vs_buildtools.exe -q
-    # Update current session env PATH
-    - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") 
+    - start /wait .\vs_buildtools.exe -q
   script:
     - mkdir -p build_cpp
     - mkdir -p install_cpp
-- 
GitLab