From: Jonathan Dieter Date: Thu, 2 Aug 2018 11:01:59 +0000 (+0100) Subject: Disable auto-features on distributions that don't support them X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~137 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f35bd175b7390f265db6a5d0cb88eb9b0ceee057;p=zchunk.git Disable auto-features on distributions that don't support them Signed-off-by: Jonathan Dieter --- diff --git a/autotest/debian-latest/Dockerfile b/autotest/debian-latest/Dockerfile index 545ab1f..02a4adb 100644 --- a/autotest/debian-latest/Dockerfile +++ b/autotest/debian-latest/Dockerfile @@ -3,5 +3,5 @@ ADD ./ /code WORKDIR /code RUN apt-get update RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -yq install meson gcc pkg-config libzstd-dev libcurl4-openssl-dev libssl-dev' -RUN meson build --auto-features=enabled +RUN meson build RUN ninja -C build test diff --git a/autotest/opensuse-leap/Dockerfile b/autotest/opensuse-leap/Dockerfile index 4bf3a71..aae3866 100644 --- a/autotest/opensuse-leap/Dockerfile +++ b/autotest/opensuse-leap/Dockerfile @@ -2,5 +2,5 @@ FROM opensuse/leap ADD ./ /code WORKDIR /code RUN zypper --non-interactive install meson gcc pkgconfig "pkgconfig(libzstd)" "pkgconfig(libcurl)" "pkgconfig(openssl)" -RUN meson build --auto-features=enabled +RUN meson build RUN ninja -C build test diff --git a/autotest/ubuntu-rolling/Dockerfile b/autotest/ubuntu-rolling/Dockerfile index a1c8366..f811377 100644 --- a/autotest/ubuntu-rolling/Dockerfile +++ b/autotest/ubuntu-rolling/Dockerfile @@ -3,5 +3,5 @@ ADD ./ /code WORKDIR /code RUN apt-get update RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -yq install meson gcc pkg-config libzstd-dev libcurl4-openssl-dev libssl-dev' -RUN meson build --auto-features +RUN meson build RUN ninja -C build test