Mesa (master): gitlab-ci: add a job that only build things needed for testing
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Nov 21 09:06:20 UTC 2019
Module: Mesa
Branch: master
Commit: 66b56270748edac7e4bf6f39f3447c3076197c71
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66b56270748edac7e4bf6f39f3447c3076197c71
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Tue Nov 19 12:23:41 2019 +0100
gitlab-ci: add a job that only build things needed for testing
For turnip and RADV testing, we will need a debugoptimized build
without UBSAN. This introduces meson-testing which builds only the
things that are needed by the test stage.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
---
.gitlab-ci.yml | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5860026296c..e50bb4a3d57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,7 +209,7 @@ arm_test:
script:
- .gitlab-ci/scons-build.sh
-meson-main:
+meson-testing:
extends:
- .meson-build
- .ci-deqp-artifacts
@@ -219,6 +219,24 @@ meson-main:
-D glx=dri
-D gbm=true
-D egl=true
+ -D platforms=x11,drm,surfaceless
+ GALLIUM_ST: >
+ -D dri3=true
+ GALLIUM_DRIVERS: "swrast"
+ LLVM_VERSION: "7"
+ BUILDTYPE: "debugoptimized"
+ script:
+ - .gitlab-ci/meson-build.sh
+ - .gitlab-ci/prepare-artifacts.sh
+
+meson-main:
+ extends: .meson-build
+ variables:
+ UNWIND: "true"
+ DRI_LOADERS: >
+ -D glx=dri
+ -D gbm=true
+ -D egl=true
-D platforms=x11,wayland,drm,surfaceless
DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
GALLIUM_ST: >
@@ -240,7 +258,6 @@ meson-main:
script:
- .gitlab-ci/meson-build.sh
- .gitlab-ci/run-shader-db.sh
- - .gitlab-ci/prepare-artifacts.sh
.meson-cross:
extends:
@@ -483,9 +500,9 @@ scons-old-llvm:
paths:
- results/
dependencies:
- - meson-main
+ - meson-testing
needs:
- - meson-main
+ - meson-testing
- x86_test
.piglit-test:
More information about the mesa-commit
mailing list