CI: Correct build-directory path on Windows, and keep it
authorDaniel Stone <daniels@collabora.com>
Thu, 18 Jun 2020 07:34:52 +0000 (08:34 +0100)
committerDaniel Stone <daniels@collabora.com>
Tue, 30 Jun 2020 09:34:02 +0000 (10:34 +0100)
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@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5689>

.gitlab-ci/windows/mesa_build.ps1

index 76cf601f1ee9d39c6863a1f54c42d6887ceede21..57a83bbf11ee885b77f23c760e044360eaca3638 100644 (file)
@@ -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