From 9ab525ea1fb35e2be3d722aaa7a3fb43afe475dd Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Thu, 20 Oct 2022 22:36:10 +0800
Subject: [PATCH] ci: Move building libva before clone llvm-project in
 mesa_deps_build.ps1

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/19187>
---
 .gitlab-ci/windows/mesa_deps_build.ps1 | 43 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
index 704356e..fd588de 100644
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -54,27 +54,6 @@ if (!$buildstatus) {
   Exit 1
 }
 
-Get-Date
-Write-Host "Cloning LLVM release/12.x"
-git clone -b release/12.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
-if (!$?) {
-  Write-Host "Failed to clone LLVM repository"
-  Exit 1
-}
-
-# ideally we want to use a tag here insted of a sha,
-# but as of today, SPIRV-LLVM-Translator doesn't have
-# a tag matching LLVM 12.0.0
-Get-Date
-Write-Host "Cloning SPIRV-LLVM-Translator"
-git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
-if (!$?) {
-  Write-Host "Failed to clone SPIRV-LLVM-Translator repository"
-  Exit 1
-}
-Push-Location deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
-git checkout 5b641633b3bcc3251a52260eee11db13a79d7258
-Pop-Location
 
 Get-Date
 Write-Host "Cloning libva"
@@ -106,6 +85,28 @@ if (!$buildstatus) {
 }
 
 Get-Date
+Write-Host "Cloning LLVM release/12.x"
+git clone -b release/12.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
+if (!$?) {
+  Write-Host "Failed to clone LLVM repository"
+  Exit 1
+}
+
+# ideally we want to use a tag here insted of a sha,
+# but as of today, SPIRV-LLVM-Translator doesn't have
+# a tag matching LLVM 12.0.0
+Get-Date
+Write-Host "Cloning SPIRV-LLVM-Translator"
+git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
+if (!$?) {
+  Write-Host "Failed to clone SPIRV-LLVM-Translator repository"
+  Exit 1
+}
+Push-Location deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
+git checkout 5b641633b3bcc3251a52260eee11db13a79d7258
+Pop-Location
+
+Get-Date
 # slightly convoluted syntax but avoids the CWD being under the PS filesystem meta-path
 $llvm_build = New-Item -ItemType Directory -ErrorAction SilentlyContinue -Force -Path ".\deps\llvm-project" -Name "build"
 Push-Location -Path $llvm_build.FullName
-- 
2.7.4