[igt-dev] [PATCH i-g-t 4/4] gitlab-ci: Do meson build with oldest supported meson

[Daniel Vetter]

On Wed, Oct 24, 2018 at 04:00:04PM +0300, Arkadiusz Hiler wrote:
> 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 <arkadiusz.hiler at intel.com>

On the series:

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  .gitlab-ci.yml    | 11 ++++++++++-
>  Dockerfile.fedora |  8 ++++++++
>  2 files changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 1814d8b6..bd1ddb79 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -21,13 +21,22 @@ stages:
>  build:tests-fedora:
>    stage: build
>    script:
> -    # Feodora does not have peg packaged
>      - meson $MESON_OPTIONS build
>      - ninja -C build
>    artifacts:
>      paths:
>        - build
>  
> +# documentation building is different with meson<0.47
> +build:tests-fedora-oldest-meson:
> +  stage: build
> +  script:
> +    - dnf remove -y meson
> +    - pip3 install /usr/src/meson-*.tar.gz
> +    - meson $MESON_OPTIONS build
> +    - ninja -C build
> +    - ninja -C build igt-gpu-tools-doc
> +
>  build:tests-debian-meson:
>    image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian:latest
>    stage: build
> 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 /
> -- 
> 2.17.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch