panfrost: Fake RGTC support

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66357057628c25f5de563d735b1dc838ec6058e7..d493ea5e34d779185ad769e980874ad605e43fd6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ test-docs:
     - *ignore_scheduled_pipelines
     - if: '$CI_PROJECT_NAMESPACE == "mesa"'
       when: never
-    - if: '$GITLAB_USER_LOGIN == "marge-bot"'
+    - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
       changes: *docs-or-ci
       when: on_success
     - changes: *docs-or-ci
@@ -173,7 +173,7 @@ success:
       when: on_success
     # Run pipeline by default if it was triggered by Marge Bot, is for a
     # merge request, and any files affecting the pipeline were changed
-    - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PROJECT_PATH != "mesa/mesa"'
+    - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
       changes:
         *all_paths
       when: on_success
@@ -221,14 +221,13 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-07-10"
 
 .use-x86_build:
   variables:
     TAG: *x86_build
   image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG"
   needs:
-    - x86_build-base
     - x86_build
 
 # Debian 10 based i386 cross-build image
@@ -236,14 +235,13 @@ i386_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &i386_build "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &i386_build "2020-07-10"
 
 .use-i386_build:
   variables:
     TAG: *i386_build
   image: "$CI_REGISTRY_IMAGE/debian/i386_build:$TAG"
   needs:
-    - x86_build-base
     - i386_build
 
 # Debian 10 based ppc64el cross-build image
@@ -251,14 +249,13 @@ ppc64el_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-10"
 
 .use-ppc64el_build:
   variables:
     TAG: *ppc64el_build
   image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:$TAG"
   needs:
-    - x86_build-base
     - ppc64el_build
 
 # Debian 10 based s390x cross-build image
@@ -273,7 +270,6 @@ s390x_build:
     TAG: *s390x_build
   image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG"
   needs:
-    - x86_build-base
     - s390x_build
 
 # Debian 10 based x86 test image base
@@ -297,7 +293,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-15-virgl"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -325,7 +321,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-07-07"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-07-10"
 
 .use-arm_build:
   variables:
@@ -340,7 +336,7 @@ arm_test-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-tracie"
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-09-cache"
 
 .use-arm_test-base:
   extends:
@@ -358,14 +354,13 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-25-kernelfix"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-09-cache"
 
 .use-arm64_test:
   variables:
     TAG: *arm64_test
   image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG"
   needs:
-    - arm_test-base
     - arm64_test
 
 # Native Windows docker builds
@@ -520,7 +515,7 @@ meson-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D platforms=x11,drm,surfaceless
+      -D platforms=x11
     GALLIUM_ST: >
       -D dri3=enabled
     GALLIUM_DRIVERS: "swrast,virgl"
@@ -540,7 +535,7 @@ meson-gallium:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D platforms=x11,wayland,drm,surfaceless
+      -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
       -D gallium-extra-hud=true
@@ -555,6 +550,7 @@ meson-gallium:
     EXTRA_OPTION: >
       -D osmesa=gallium
       -D tools=all
+      -D werror=true
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/run-shader-db.sh
@@ -584,7 +580,7 @@ meson-classic:
       -D glx=disabled
       -D gbm=disabled
       -D egl=enabled
-      -D platforms=surfaceless
+      -D platforms=[]
       -D osmesa=none
     GALLIUM_ST: >
       -D dri3=disabled
@@ -704,7 +700,7 @@ meson-clover-old-llvm:
       -D glx=disabled
       -D egl=disabled
       -D gbm=disabled
-      -D platforms=drm,surfaceless
+      -D platforms=[]
     GALLIUM_DRIVERS: "i915,r600"
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
@@ -721,7 +717,7 @@ meson-vulkan:
       -D glx=disabled
       -D gbm=disabled
       -D egl=disabled
-      -D platforms=x11,wayland,drm
+      -D platforms=x11,wayland
       -D osmesa=none
     GALLIUM_ST: >
       -D dri3=enabled
@@ -810,13 +806,8 @@ meson-mingw32-x86_64:
     TAG: *x86_test-gl
   image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
   needs:
-    - x86_build-base
-    - x86_build
     - meson-testing
-    - x86_test-base
     - x86_test-gl
-  dependencies:
-    - meson-testing
 
 .test-vk:
   extends:
@@ -825,13 +816,8 @@ meson-mingw32-x86_64:
     TAG: *x86_test-vk
   image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG"
   needs:
-    - x86_build-base
-    - x86_build
     - meson-testing
-    - x86_test-base
     - x86_test-vk
-  dependencies:
-    - meson-testing
 
 .piglit-test:
   extends:
@@ -855,7 +841,6 @@ piglit-quick_gl:
     NIR_VALIDATE: 0
     PIGLIT_OPTIONS: >
       --process-isolation false
-      -x arb_gpu_shader5
       -x egl_ext_device_
       -x egl_ext_platform_device
       -x ext_timer_query@time-elapsed
@@ -1165,9 +1150,7 @@ arm64_a306_gles2:
   script:
     - ./install/bare-metal/fastboot.sh
   needs:
-    - arm_test-base
     - arm64_test
-    - arm_build
     - meson-arm64
   tags:
     - google-freedreno-db410c