lima/ppir: Add fddx and fddy

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5ae08ce7777e6e2e490756fc077bdbe26e8dbab..b986d439a6c3c37cc72c4d029807c5a0ec220d3e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-07-11"
+  DEBIAN_TAG: "2019-08-08"
   DEBIAN_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
@@ -61,8 +61,12 @@ debian:
     paths:
       - ccache
   artifacts:
-    when: on_failure
-    untracked: true
+    when: always
+    paths:
+      - _build/meson-logs/*.txt
+      # scons:
+      - build/*/config.log
+      - shader-db
   variables:
     CCACHE_COMPILERCHECK: "content"
   # Use ccache transparently, and print stats before/after
@@ -175,6 +179,7 @@ meson-main:
     LLVM_VERSION: "7"
     EXTRA_OPTION: >
       -D tools=all
+    MESON_SHADERDB: "true"
 
 meson-clover:
   extends: .meson-build
@@ -246,20 +251,13 @@ meson-vulkan:
       -D gallium-xa=false
       -D gallium-nine=false
       -D llvm=false
-    CROSS: >
-      --libdir lib
-      --cross /tmp/cross_file.txt
-
   script:
-    - /usr/share/meson/debcrossgen --arch ${ARCH} -o /tmp/cross_file.txt
-    # Work around a bug in debcrossgen that should be fixed in the next release
-    - sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" /tmp/cross_file.txt
     - .gitlab-ci/meson-build.sh
 
 meson-armhf:
   extends: .meson-cross
   variables:
-    ARCH: armhf
+    CROSS: armhf
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
     # Disable the tests since we're cross compiling.
@@ -271,7 +269,7 @@ meson-armhf:
 meson-arm64:
   extends: .meson-cross
   variables:
-    ARCH: arm64
+    CROSS: arm64
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
     # Disable the tests since we're cross compiling.
@@ -283,7 +281,7 @@ meson-arm64:
 meson-i386:
   extends: .meson-cross
   variables:
-    ARCH: i386
+    CROSS: i386
     VULKAN_DRIVERS: intel
     GALLIUM_DRIVERS: "swrast"
     # Disable i386 tests, because u_format_tests gets precision