From e3e1e9f82ca934ce433bba2dcb544ca51edcb5f1 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 18 Jun 2020 08:34:52 +0100 Subject: [PATCH] CI: Correct build-directory path on Windows, and keep it MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer Reviewed-by: Eric Engestrom Reviewed-by: Eric Anholt Part-of: --- .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 -- 2.30.2