diff options
author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-12-02 11:28:31 +0100 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-12-02 12:02:21 +0000 |
commit | 195a001d7366a23c569c38437390edc5ad1c25e9 (patch) | |
tree | 3678f80c98b0db89a6597380a6ff5d4816773e1a | |
parent | 361d143f941c34aead2bbad8541aa1eca54149ad (diff) |
gitlab-ci: do not clone git-repo for test-job
The only thing we really need from the git-repo is the piglit_run.ps1
script, so let's upload that into our artifacts instead.
Fixes: d560addc30e ("gitlab-ci: run piglit on windows")
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7867>
-rw-r--r-- | .gitlab-ci.yml | 3 | ||||
-rw-r--r-- | .gitlab-ci/windows/mesa_build.ps1 | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8a79a6a21c..7ef8316c02a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -821,11 +821,12 @@ test-d3d12-windows: needs: - meson-windows-vs2019 variables: + GIT_STRATEGY: none # testing doesn't build anything from source GALLIUM_DRIVER: d3d12 PIGLIT_PROFILE: quick_gl PIGLIT_OPTIONS: -x nv_copy_depth_to_color script: - - . .\.gitlab-ci\windows\piglit_run.ps1 + - . _install/piglit_run.ps1 artifacts: when: on_failure name: "mesa_${CI_JOB_NAME}" diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 index 300055fbfa0..e6106275068 100644 --- a/.gitlab-ci/windows/mesa_build.ps1 +++ b/.gitlab-ci/windows/mesa_build.ps1 @@ -17,3 +17,5 @@ if (!$buildstatus) { Write-Host "Mesa build or test failed" Exit 1 } + +Copy-Item ".\.gitlab-ci\windows\piglit_run.ps1" -Destination $installdir |