ci: move to using clang 10 for meson + clover

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7017>
2020-10-06 10:49:00 +10:00
parent ae7189df6e
commit 137d7d29fa
6 changed files with 26 additions and 20 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -240,7 +240,7 @@ x86_build-base:
    - .fdo.container-build@debian
    - .container
  variables:
-    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-10-06-clang10-2"

 .use-x86_build-base:
  extends:
@@ -258,7 +258,7 @@ x86_build:
  extends:
    - .use-x86_build-base
  variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-09-10-libdrm"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-10-06-clang10-2"

 .use-x86_build:
  variables:
@@ -272,7 +272,7 @@ i386_build:
  extends:
    - .use-x86_build-base
  variables:
-    FDO_DISTRIBUTION_TAG: &i386_build "2020-09-10-libdrm"
+    FDO_DISTRIBUTION_TAG: &i386_build "2020-10-06-clang10-2"

 .use-i386_build:
  variables:
@@ -286,7 +286,7 @@ ppc64el_build:
  extends:
    - .use-x86_build-base
  variables:
-    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-09-10-libdrm"
+    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-10-06-clang10-2"

 .use-ppc64el_build:
  variables:
@@ -300,7 +300,7 @@ s390x_build:
  extends:
    - .use-x86_build-base
  variables:
-    FDO_DISTRIBUTION_TAG: &s390x_build "2020-09-10-libdrm"
+    FDO_DISTRIBUTION_TAG: &s390x_build "2020-10-06-clang10-2"

 .use-s390x_build:
  variables:
@@ -313,7 +313,7 @@ s390x_build:
 x86_test-base:
  extends: x86_build-base
  variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-base "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &x86_test-base "2020-10-06-clang10-2"

 .use-x86_test-base:
  extends:
@@ -330,13 +330,13 @@ x86_test-base:
 x86_test-gl:
  extends: .use-x86_test-base
  variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-09-10-libdrm"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-10-06-clang10-2"

 # Debian 10 based x86 test image for VK
 x86_test-vk:
  extends: .use-x86_test-base
  variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-08-31-deqp-version"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-10-06-clang10-2"

 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -373,7 +373,7 @@ arm_test-base:
    - .fdo.container-build@debian
    - .container
  variables:
-    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-09-10-libdrm"
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-10-06-clang10-2"

 .use-arm_test-base:
  extends:
@@ -530,7 +530,7 @@ make git archive:
    - .use-x86_build
  stage: meson-x86_64
  variables:
-    LLVM_VERSION: 9
+    LLVM_VERSION: 10
  script:
    - .gitlab-ci/meson-build.sh

@@ -747,8 +747,8 @@ meson-clang:
    DRI_DRIVERS: "auto"
    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra"
    VULKAN_DRIVERS: intel,amd,freedreno
-    CC: "ccache clang-9"
-    CXX: "ccache clang++-9"
+    CC: "ccache clang-10"
+    CXX: "ccache clang++-10"

 .meson-windows-vs2019:
  extends:
@@ -784,8 +784,9 @@ meson-clover:
      -D gallium-nine=false
      -D gallium-opencl=icd
  script:
-    - .gitlab-ci/meson-build.sh
    - LLVM_VERSION=8 .gitlab-ci/meson-build.sh
+    - LLVM_VERSION=9 .gitlab-ci/meson-build.sh
+    - .gitlab-ci/meson-build.sh

 meson-vulkan:
  extends: .meson-build
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -16,6 +16,7 @@ apt-get install -y \
 # Upstream LLVM package repository
 apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
 echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
+echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list

 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
@@ -26,7 +27,7 @@ apt-get install -y --no-remove \
        $STABLE_EPHEMERAL \
        bison \
        ccache \
-        clang-9 \
+        clang-10 \
        dpkg-cross \
        flex \
        g++ \
@@ -34,6 +35,7 @@ apt-get install -y --no-remove \
        gcc \
        git \
        libclang-9-dev \
+        libclang-10-dev \
        libclc-dev \
        libelf-dev \
        libepoxy-dev \
@@ -57,6 +59,7 @@ apt-get install -y --no-remove \
        libxxf86vm-dev \
        libz-mingw-w64-dev \
        llvm-9-dev \
+        llvm-10-dev \
        pkg-config \
        python-mako \
        python3-mako \
--- a/.gitlab-ci/container/x86_test-base.sh
+++ b/.gitlab-ci/container/x86_test-base.sh
@@ -12,6 +12,7 @@ apt-get install -y \
 # Upstream LLVM package repository
 apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
 echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
+echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list

 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
@@ -24,6 +25,7 @@ apt-get install -y --no-remove \
      git-lfs \
      libexpat1 \
      libllvm9 \
+      libllvm10 \
      liblz4-1 \
      libpcre32-3 \
      libpng16-16 \
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -8,11 +8,11 @@ elif [ $DEBIAN_ARCH = amd64 ]; then
    # Upstream LLVM package repository
    apt-get -y install --no-install-recommends gnupg ca-certificates
    apt-key add /llvm-snapshot.gpg.key
-    echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
+    echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
    apt-get update

    ARCH_PACKAGES="libelf1
-                   libllvm9
+                   libllvm10
                   libxcb-dri2-0
                   libxcb-dri3-0
                   libxcb-present0
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-08-18-new-kernel-6"
+  DISTRIBUTION_TAG: "2020-10-06-clang10-2"

 .kernel+rootfs:
  stage: container-2
--- a/.gitlab-ci/traces-radeonsi.yml
+++ b/.gitlab-ci/traces-radeonsi.yml
@@ -37,7 +37,7 @@ traces:
  - path: gputest/pixmark-piano.trace
    expectations:
      - device: gl-radeonsi-stoney
-        checksum: 777d48e82cabceef6d9489189f91d266
+        checksum: 014b88f3357d32af0c306d4a14eb36ef
  - path: gputest/triangle.trace
    expectations:
      - device: gl-radeonsi-stoney
@@ -173,7 +173,7 @@ traces:
  - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc
    expectations:
      - device: gl-radeonsi-stoney
-        checksum: 990abd360dc380c95ee2645f8b402d47
+        checksum: 41a0b6eddecdf1df645ccf34082aac88
  - path: gputest/gimark.trace
    expectations:
      - device: gl-radeonsi-stoney
@@ -189,7 +189,7 @@ traces:
  - path: gputest/pixmark-piano.trace
    expectations:
      - device: gl-radeonsi-stoney
-        checksum: 777d48e82cabceef6d9489189f91d266
+        checksum: 014b88f3357d32af0c306d4a14eb36ef
  - path: gputest/pixmark-volplosion.trace
    expectations:
      - device: gl-radeonsi-stoney