modetest: get the crtc_id from the pipe_arg

[android-x86/external-libdrm.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 765a18d..a6e3bd4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,13 +14,13 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/drm
-  DEBIAN_TAG: "2019-10-20"
+  DEBIAN_TAG: "2019-11-16"
   DEBIAN_VERSION: buster-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
 include:
   - project: 'wayland/ci-templates'
-    ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
+    ref: 0a9bdd33a98f05af6761ab118b5074952242aab0
     file: '/templates/debian.yml'
 
 stages:
@@ -56,7 +56,7 @@ debian:
   variables:
     GIT_DEPTH: 10
   script:
-    - meson _build
+    - meson build
         -D amdgpu=true
         -D cairo-tests=true
         -D etnaviv=true
@@ -71,16 +71,17 @@ debian:
         -D radeon=true
         -D tegra=true
         -D udev=true
-        -D valgrind=true
+        -D valgrind=auto
         -D vc4=true
         -D vmwgfx=true
-    - ninja -C _build
-    - ninja -C _build test
-    - DESTDIR=$PWD/install ninja -C _build install
+        ${CROSS+--cross /cross_file-$CROSS.txt}
+    - ninja -C build
+    - ninja -C build test
+    - DESTDIR=$PWD/install ninja -C build install
   artifacts:
     when: on_failure
     paths:
-      - _build/meson-logs/*
+      - build/meson-logs/*
 
 meson-x86_64:
   extends:
@@ -90,6 +91,26 @@ meson-x86_64:
   needs:
     - debian
 
+meson-i386:
+  extends: meson-x86_64
+  variables:
+    CROSS: i386
+
+meson-aarch64:
+  extends: meson-x86_64
+  variables:
+    CROSS: arm64
+
+meson-armhf:
+  extends: meson-x86_64
+  variables:
+    CROSS: armhf
+
+meson-ppc64el:
+  extends: meson-x86_64
+  variables:
+    CROSS: ppc64el
+
 meson-arch-daily:
   rules:
     - if: '$SCHEDULE == "arch-daily"'