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 <agomez@igalia.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
# 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"
python-setuptools \
python3.5 \
python3-pip \
- python3-setuptools
+ python3-setuptools \
+ ninja-build
RUN apt-get install -y \
libxcb-randr0
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'