ci: bump cross compilation to LLVM 13 where possible

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17575>

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index b8e6080..8bc0476 100644 (file)
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -490,6 +490,7 @@ debian-i386:
     CROSS: i386
     VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus"
+    LLVM_VERSION: 13
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
 
@@ -503,8 +504,7 @@ debian-s390x:
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast,zink"
-    # The lp_test_blend test times out with LLVM 11
-    LLVM_VERSION: 9
+    LLVM_VERSION: 13
     VULKAN_DRIVERS: "swrast"
 
 debian-ppc64el:

diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index 024696b..e5db3a0 100644 (file)
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -38,8 +38,9 @@ apt-get install -y --no-remove \
         wget
 
 if [[ $arch != "armhf" ]]; then
-    if [[ $arch == "s390x" ]]; then
-        LLVM=9
+    # See the list of available architectures in https://apt.llvm.org/bullseye/dists/llvm-toolchain-bullseye-13/main/
+    if [[ $arch == "s390x" ]] || [[ $arch == "i386" ]] || [[ $arch == "arm64" ]]; then
+        LLVM=13
     else
         LLVM=11
     fi

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 20c9a8e..9b1e5d8 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -3,7 +3,7 @@ variables:
    DEBIAN_BASE_TAG: "2022-08-27-drop-wine32"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-08-25-shellcheck"
+   DEBIAN_BUILD_TAG: "2022-07-29-s390xxx"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"