diff options
author | Yonggang Luo <luoyonggang@gmail.com> | 2022-10-20 22:36:10 +0800 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2022-10-20 22:52:06 +0000 |
commit | 9ab525ea1fb35e2be3d722aaa7a3fb43afe475dd (patch) | |
tree | db0ee7ec92126612164d13dcdb8dac14620e036f /.gitlab-ci/windows | |
parent | a3872ff4f8087326f832f6ce96478e7481e6cfba (diff) | |
download | mesa-9ab525ea1fb35e2be3d722aaa7a3fb43afe475dd.tar.gz |
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>
Diffstat (limited to '.gitlab-ci/windows')
-rw-r--r-- | .gitlab-ci/windows/mesa_deps_build.ps1 | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index 704356e8979..fd588de8709 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 |