virgl: fix fence fd version check

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a923dd7af0cbb52e96db9f8c2c567b25c24ab621..e3aa2a4482c320210e749c0f654f72e783473035 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ stages:
 # When to automatically run the CI
 .ci-run-policy: &ci-run-policy
   only:
-    - master
+    - branches@mesa/mesa
     - merge_requests
     - /^ci([-/].*)?$/
   retry:
@@ -117,21 +117,6 @@ ubuntu:
     - scons $SCONS_TARGET
     - eval $SCONS_CHECK_COMMAND
 
-autotools:
-  extends: .build
-  variables:
-    MAKEFLAGS: "-j8"
-    LLVM_CONFIG: llvm-config-7
-  script:
-    - mkdir build
-    - cd build
-    - ../autogen.sh
-        --enable-autotools
-        --enable-debug
-        --disable-llvm-shared-libs
-    - make
-    - make check
-
 # 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.
@@ -263,7 +248,7 @@ meson-gallium-drivers-other:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost"
+    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima"
     LLVM_VERSION: "5.0"
 
 meson-gallium-clover-llvm:
@@ -301,6 +286,7 @@ meson-gallium-st-other:
       -D gbm=false
     GALLIUM_ST: >
       -D dri3=true
+      -D gallium-extra-hud=true
       -D gallium-vdpau=true
       -D gallium-xvmc=true
       -D gallium-omx=bellagio