ci: Ensure composefs+openssl are is enabled on Fedora

For some reason we're not picking this up in the Prow build,
which breaks things because now rpm-ostree hard requires it.

Let's make this a fatal build time error for more clear
debugging.

diff --git a/ci/build.sh b/ci/build.sh
index 4860565845c56b5d1a5d00655be6e0b87019c797..18bc529aafdc71a2072b3b89c8d5137027e0f897 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -20,6 +20,9 @@ if test "${OS_ID}" = 'fedora'; then
         *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
     esac
 fi
+if [[ "${OS_ID_LIKE}" =~ rhel|fedora ]]; then
+    CONFIGOPTS="${CONFIGOPTS:-} --with-composefs --with-openssl"
+fi
 case "${CONFIGOPTS:-}" in
     *--with-curl*|--with-soup*)
         if test -x /usr/bin/gnome-desktop-testing-runner; then

diff --git a/ci/libbuild.sh b/ci/libbuild.sh
index 9938e282fa16602830d43b1907bfd1937d2234bc..76bdf096be3aff54ac999687f5bea8df8e5ba61c 100644 (file)
--- a/ci/libbuild.sh
+++ b/ci/libbuild.sh
@@ -3,6 +3,7 @@
 dn=$(cd $(dirname $0) && pwd)
 
 OS_ID=$(. /etc/os-release; echo $ID)
+OS_ID_LIKE=$(. /etc/os-release; echo $ID ${ID_LIKE:-})
 OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
 
 pkg_upgrade() {