Mesa (master): CI: Correct build-directory path on Windows, and keep it

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e3e1e9f82ca934ce433bba2dcb544ca51edcb5f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3e1e9f82ca934ce433bba2dcb544ca51edcb5f1

Author: Daniel Stone <daniels at collabora.com>
Date:   Thu Jun 18 08:34:52 2020 +0100

CI: Correct build-directory path on Windows, and keep it

Build job artifacts capture Meson logs from _build, so we can analyse
what Meson did during configuration, as well as the full output of any
test jobs.

We were previously calling our build directory 'build', which meant it
wouldn't have been captured by the artifacts, and we were also deleting
it to make really sure there was no chance of logs getting captured
either.

Rename the build directory to '_build' to match the others, and don't
delete it either, so we can keep our configure/test logs.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5689>

---

 .gitlab-ci/windows/mesa_build.ps1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 76cf601f1ee..57a83bbf11e 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -4,12 +4,11 @@ Write-Host "Refreshing Windows TLS CA cache"
 
 Get-Date
 Write-Host "Compiling Mesa"
-$builddir = New-Item -ItemType Directory -Name "build"
+$builddir = New-Item -ItemType Directory -Name "_build"
 Push-Location $builddir.FullName
 cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" --pkg-config-path="C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig" -Dllvm=true -Dshared-llvm=false -Dgallium-drivers=swrast -Dbuild-tests=true && ninja test'
 $buildstatus = $?
 Pop-Location
-Remove-Item -Recurse -Path $builddir
 
 Get-Date