From 66b56270748edac7e4bf6f39f3447c3076197c71 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 19 Nov 2019 12:23:41 +0100 Subject: [PATCH] gitlab-ci: add a job that only build things needed for testing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer --- .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,10 +209,28 @@ arm_test: script: - .gitlab-ci/scons-build.sh -meson-main: +meson-testing: extends: - .meson-build - .ci-deqp-artifacts + variables: + UNWIND: "true" + DRI_LOADERS: > + -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: > @@ -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: -- 2.30.2