From e689b8b4a563764d72b2985f170a6d7283f87cb0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Sep 2017 15:19:05 -0400 Subject: [PATCH] ci: Add an "all options disabled" context We keep occasionally regressing this so let's start covering it now. I'm intentionally not running the tests since that would likely entail a lot more conditionalizing pain. Closes: #1194 Approved by: jlebon --- .papr.yml | 14 ++++++++++++++ ci/build.sh | 16 ++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.papr.yml b/.papr.yml index 56ff4dae..4ae345e6 100644 --- a/.papr.yml +++ b/.papr.yml @@ -74,6 +74,20 @@ tests: --- +inherit: true + +context: f26-minimal +env: + CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man + --disable-rust --without-libarchive --without-selinux --without-smack + --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse + --disable-experimental-api' + +tests: + - ci/build.sh + +--- + inherit: true required: true diff --git a/ci/build.sh b/ci/build.sh index 33ef9503..572ae197 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -21,15 +21,19 @@ pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 export CFLAGS="-Werror ${CFLAGS:-}" -DETECTED_CONFIGOPTS= -if test -x /usr/bin/gnome-desktop-testing-runner; then - DETECTED_CONFIGOPTS="${DETECTED_CONFIGOPTS} --enable-installed-tests=exclusive" -fi # Default libcurl on by default in fedora unless libsoup is enabled if sh -c '. /etc/os-release; test "${ID}" = fedora'; then case "${CONFIGOPTS:-}" in - *--with-soup*) ;; + *--with-soup*|*--without-curl*) ;; *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl" esac fi -build --enable-gtk-doc ${DETECTED_CONFIGOPTS} ${CONFIGOPTS:-} +case "${CONFIGOPTS:-}" in + *--with-curl*|--with-soup*) + if test -x /usr/bin/gnome-desktop-testing-runner; then + CONFIGOPTS="${CONFIGOPTS} --enable-installed-tests=exclusive" + fi + ;; +esac + +build --enable-gtk-doc ${CONFIGOPTS:-}