From: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed, 3 Apr 2019 10:23:51 +0000 (+0200)
Subject: gitlab-ci: Use Debian packages instead of pip ones for meson and scons
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ecb3eedc54995c722af6ee477f3d818169a9d129;p=mesa.git

gitlab-ci: Use Debian packages instead of pip ones for meson and scons

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a77c4037fa9..3a53fae7f60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,7 @@ debian:
     - cd _build
     - meson configure
     - ninja -j4
-    - ninja test
+    - LC_ALL=C.UTF-8 ninja test
 
 .scons-build:
   extends: .build
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 4b7df61cb4b..9275c34ebf0 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -56,15 +56,10 @@ apt-get install -y -t stretch-backports \
       libelf-dev \
       libunwind8-dev \
       libglvnd-dev \
-      python2.7 \
-      python-pip \
-      python-setuptools \
-      python-wheel \
-      python3.5 \
-      python3-pip \
-      python3-setuptools \
-      python3-wheel \
-      ninja-build
+      python-mako \
+      python3-mako \
+      meson \
+      scons
 
 apt-get install -y \
       libxcb-randr0
@@ -156,12 +151,6 @@ wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz
 tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.xz
 (cd $WAYLAND_PROTOCOLS_VERSION && ./configure && make install) && rm -rf $WAYLAND_PROTOCOLS_VERSION
 
-pip3 install 'meson>=0.49'
-pip2 install 'scons>=2.4'
-
-pip2 install mako
-pip3 install mako
-
 # Use ccache to speed up builds
 apt-get install -y ccache