diff options
| author | Michel Dänzer <[email protected]> | 2019-08-28 12:01:02 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2019-08-30 11:25:26 +0200 |
| commit | 42f8d5a531c4996dfacda2f88f14f55fa9677e02 (patch) | |
| tree | d8d67ac553bf0a78e8cb8ae8adfdc10a3634d806 /.gitlab-ci.yml | |
| parent | 873b092e9110a0605293db7bc1c5bcb749cf9a28 (diff) | |
gitlab-ci: Move up meson-main job definition
In order to increase the chance of it running early.
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8977b86341e..fd80edb37d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,6 +111,35 @@ debian: - scons $SCONS_TARGET - eval $SCONS_CHECK_COMMAND +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: > + -D dri3=true + -D gallium-extra-hud=true + -D gallium-vdpau=true + -D gallium-xvmc=true + -D gallium-omx=bellagio + -D gallium-va=true + -D gallium-xa=true + -D gallium-nine=true + -D gallium-opencl=disabled + 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" + BUILDTYPE: "debugoptimized" + <<: *ci-deqp-artifacts + # NOTE: Building SWR is 2x (yes two) times slower than all the other # gallium drivers combined. # Start this early so that it doesn't limit the total run time. @@ -164,35 +193,6 @@ scons-win64: SCONS_TARGET: platform=windows machine=x86_64 SCONS_CHECK_COMMAND: "true" -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: > - -D dri3=true - -D gallium-extra-hud=true - -D gallium-vdpau=true - -D gallium-xvmc=true - -D gallium-omx=bellagio - -D gallium-va=true - -D gallium-xa=true - -D gallium-nine=true - -D gallium-opencl=disabled - 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" - BUILDTYPE: "debugoptimized" - <<: *ci-deqp-artifacts - meson-clover: extends: .meson-build variables: |