drm: Branch 'main' - 2 commits

[GitLab M. <git...@ke...>]

 .gitlab-ci/debian-install.sh |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1637d8b02088fff62aed5a9796eddcb9f0f60656
Author: Eric Engestrom <er...@en...>
Date:   Mon Aug 22 17:41:18 2022 +0100

    ci: fix the tested meson version
    Reviewed-by: Simon Ser <co...@em...>

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index d50dc613..6f7a212f 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -68,4 +68,4 @@ done
 apt-get purge -y $EPHEMERAL
 
 # Test that the oldest Meson version we claim to support is still supported
-pip3 install meson==0.46
+pip3 install meson==0.53
commit 24163f40d3b4c7790c843e99f85143e551201608
Author: Eric Engestrom <er...@en...>
Date:   Mon Aug 22 17:40:09 2022 +0100

    ci: remove system meson before installing the pip one
    Reviewed-by: Simon Ser <co...@em...>

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index ab901360..d50dc613 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -26,14 +26,18 @@ EOF
 
 apt-get dist-upgrade -y
 
+EPHEMERAL="
+  meson \
+  "
+
 apt-get install -y --no-remove \
+  $EPHEMERAL \
   build-essential \
   docbook-xsl \
   libatomic-ops-dev \
   libcairo2-dev \
   libcunit1-dev \
   libpciaccess-dev \
-  meson \
   ninja-build \
   pkg-config \
   python3 \
@@ -61,6 +65,7 @@ for arch in ${CROSS_ARCHITECTURES[@]}; do
   fi
 done
 
+apt-get purge -y $EPHEMERAL
 
 # Test that the oldest Meson version we claim to support is still supported
 pip3 install meson==0.46