panfrost: Stub out G31/G52 quirks

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75b2578b6c83ccb4f5db7a02667743e8fb93ee3d..f1697574de2201aa2ba7adfe822153221112bc9b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
 
 include:
   - project: 'freedesktop/ci-templates'
-    ref: a1699326519fd28526485ce93464e33423bac564
+    ref: 4b2997287317808830e9cb4eb0f99b691787da88
     file: '/templates/debian.yml'
   - local: '.gitlab-ci/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
@@ -110,7 +110,7 @@ success:
     - .ci-run-policy
   variables:
     FDO_DISTRIBUTION_VERSION: buster-slim
-    FDO_REPO_SUFFIX: $CI_JOB_NAME
+    FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
     FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
@@ -118,7 +118,7 @@ success:
 # Debian 10 based x86 build image
 x86_build:
   extends:
-    - .fdo.container-ifnot-exists@debian
+    - .fdo.container-build@debian
     - .container
   variables:
     FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13"
@@ -140,7 +140,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-23"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-27"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -159,7 +159,7 @@ x86_build_old:
 # Debian 10 based ARM build image
 arm_build:
   extends:
-    - .fdo.container-ifnot-exists@debian@arm64v8
+    - .fdo.container-build@debian@arm64v8
     - .container
   variables:
     FDO_DISTRIBUTION_TAG: &arm_build "2020-03-24"
@@ -214,6 +214,7 @@ windows_build_vs2019:
     - windows
     - shell
     - "1809"
+    - mesa
   script:
     - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $WINDOWS_IMAGE $WINDOWS_UPSTREAM_IMAGE
   
@@ -258,6 +259,7 @@ windows_build_vs2019:
     - windows
     - docker
     - "1809"
+    - mesa
   cache:
     key: ${CI_JOB_NAME}
     paths:
@@ -436,8 +438,9 @@ meson-windows-vs2019:
 scons-win64:
   extends: .scons-build
   variables:
-    SCONS_TARGET: platform=windows machine=x86_64
+    SCONS_TARGET: platform=windows machine=x86_64 debug=1
     SCONS_CHECK_COMMAND: "true"
+  allow_failure: true
 
 meson-clover:
   extends: .meson-build
@@ -557,22 +560,6 @@ meson-mingw32-x86_64:
       -Dosmesa=gallium
       --cross-file=.gitlab-ci/x86_64-w64-mingw32
 
-scons:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "llvm=1 swr=1"
-    SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check"
-  script:
-    - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=9 .gitlab-ci/scons-build.sh
-
-scons-old-llvm:
-  extends:
-    - scons
-    - .use-x86_build_old
-  script:
-    - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
-
 .test:
   extends:
     - .ci-run-policy