diff options
| author | Michel Dänzer <[email protected]> | 2019-04-03 12:23:51 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2019-04-16 10:41:07 +0200 |
| commit | ecb3eedc54995c722af6ee477f3d818169a9d129 (patch) | |
| tree | ae67a56bb660a7b0cf30e6223697a1dc0478e401 | |
| parent | caf83e96e47ee8418678753472a2995f870b89a9 (diff) | |
gitlab-ci: Use Debian packages instead of pip ones for meson and scons
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 19 |
2 files changed, 5 insertions, 16 deletions
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 |