From d445be01f5edc7e7a324444c73e221c9ed75602e Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Wed, 24 Oct 2018 14:47:02 +0300 Subject: gitlab-ci: Do meson build with oldest supported meson Documentation building differs for meson < 0.47, so let's make sure that it works. Also remove a comment that has slipped through. Signed-off-by: Arkadiusz Hiler Reviewed-by: Daniel Vetter --- Dockerfile.fedora | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Dockerfile.fedora') diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 341a0ed7..652a36c3 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -10,6 +10,7 @@ RUN dnf install -y gcc \ kmod-devel \ glib2-devel \ cairo-devel \ + ninja-build \ procps-devel \ pixman-devel \ json-c-devel \ @@ -34,3 +35,10 @@ RUN curl -O http://piumarta.com/software/peg/peg-0.1.18.tar.gz RUN tar xf peg-0.1.18.tar.gz RUN cd peg-0.1.18 && make PREFIX=/usr install RUN rm -fr /tmp/peg + +# Meson version switching shenanigans +WORKDIR /usr/src +RUN curl -O https://files.pythonhosted.org/packages/c0/98/bcbda7862f8ca18dbdaa57b9c51cf7333cdc59b48278ed279217cd6ad8ff/meson-0.44.0.tar.gz + +# Cleanup workdir +WORKDIR / -- cgit v1.2.3