diff options
| author | Eric Anholt <eric@anholt.net> | 2019-08-07 14:05:51 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2019-08-13 10:29:34 -0700 |
| commit | 030aa6e184bdff6e5cf9f18f703577e8d36c0549 (patch) | |
| tree | 9d399035b4d07d088f5e44f0c433ea87387c5de9 /.gitlab-ci.yml | |
| parent | b816edcbf40abca1e3d68b1a706f5670b3fcf4d7 (diff) | |
gitlab-ci: Move around which builds cover which swrast.
I want to enable CI of llvmpipe out of the meson-main build. So, kick
classic swrast/osmesa to meson-i386, then promote llvmpipe to
meson-main (along with nine, now that classic osmesa isn't keeping it
out of there).
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b986d439a6c..f375a7c2423 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,12 +100,8 @@ debian: # gallium drivers combined. # Start this early so that it doesn't limit the total run time. # -# We also put softpipe (and therefore gallium nine, which requires -# it) here, since softpipe/llvmpipe can't be built alongside classic -# swrast. -# -# Putting glvnd here is arbitrary, but we want it in one of the builds -# for coverage. +# We also stick the glvnd build here, since we want non-glvnd in +# meson-main for actual driver CI. meson-swr-glvnd: extends: .meson-build variables: @@ -120,10 +116,9 @@ meson-swr-glvnd: -D gallium-omx=disabled -D gallium-va=false -D gallium-xa=false - -D gallium-nine=true + -D gallium-nine=false -D gallium-opencl=disabled - -D osmesa=gallium - GALLIUM_DRIVERS: "swr,swrast,iris" + GALLIUM_DRIVERS: "swr,iris" LLVM_VERSION: "6.0" meson-clang: @@ -163,8 +158,7 @@ meson-main: -D gbm=true -D egl=true -D platforms=x11,wayland,drm,surfaceless - -D osmesa=classic - DRI_DRIVERS: "i915,i965,r100,r200,swrast,nouveau" + DRI_DRIVERS: "i915,i965,r100,r200,nouveau" GALLIUM_ST: > -D dri3=true -D gallium-extra-hud=true @@ -173,11 +167,12 @@ meson-main: -D gallium-omx=bellagio -D gallium-va=true -D gallium-xa=true - -D gallium-nine=false + -D gallium-nine=true -D gallium-opencl=disabled - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima" + GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima" LLVM_VERSION: "7" EXTRA_OPTION: > + -D osmesa=gallium -D tools=all MESON_SHADERDB: "true" @@ -278,17 +273,23 @@ meson-arm64: -D I-love-half-baked-turnips=true -D vulkan-overlay-layer=true +# While the main point of this build is testing the i386 cross build, +# we also use this one to test some other options that are exclusive +# with meson-main's choices (classic swrast and osmesa) meson-i386: extends: .meson-cross variables: CROSS: i386 VULKAN_DRIVERS: intel - GALLIUM_DRIVERS: "swrast" + DRI_DRIVERS: "swrast" + GALLIUM_DRIVERS: "iris" # Disable i386 tests, because u_format_tests gets precision # failures in dxtn unpacking EXTRA_OPTION: > -D build-tests=false -D vulkan-overlay-layer=true + -D llvm=false + -D osmesa=classic scons-nollvm: extends: .scons-build |