From cf79d62f90a857c92e45f3ab6ba363b0688ce0f0 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Tue, 5 Mar 2019 13:55:17 +0200 Subject: [PATCH] gitlab-ci: install distro's ninja Ubuntu Bionic is shipping ninja 1.8.2. Therefore, we do not need to download v1.6.0 manually any more. Signed-off-by: Andres Gomez Reviewed-by: Eric Engestrom --- .gitlab-ci.yml | 2 +- .gitlab-ci/Dockerfile.ubuntu | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdb503251ab..ee67619cbc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ # The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays # at "01" unless you have multiple updates on the same day :) variables: - UBUNTU_TAG: 2019-02-27-01 + UBUNTU_TAG: 2019-03-05-01 UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG" UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG" diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index d935e92768c..83ab85d6f89 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -51,7 +51,8 @@ RUN apt-get install -y \ python-setuptools \ python3.5 \ python3-pip \ - python3-setuptools + python3-setuptools \ + ninja-build RUN apt-get install -y \ libxcb-randr0 @@ -143,15 +144,6 @@ RUN wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz RUN tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.xz RUN (cd $WAYLAND_PROTOCOLS_VERSION && ./configure && make install) && rm -rf $WAYLAND_PROTOCOLS_VERSION - -RUN apt-get install -y unzip - -# Meson requires ninja >= 1.6, but xenial has 1.3.x -RUN wget https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-linux.zip -RUN unzip ninja-linux.zip && rm ninja-linux.zip -RUN mv ninja /usr/bin/ - - RUN pip3 install 'meson>=0.49' RUN pip2 install 'scons>=2.4' -- 2.30.2