diff --git a/.papr.yml b/.papr.yml index f13eb1cf..32d2b224 100644 --- a/.papr.yml +++ b/.papr.yml @@ -12,6 +12,8 @@ packages: - git env: + # At some point soon will encourage distros to use libcurl + CONFIGOPTS: "--with-curl --with-openssl" # Enable all the sanitizers for this primary build. # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' @@ -79,14 +81,10 @@ tests: inherit: true required: true -context: f26-curl-openssl - -packages: - - pkgconfig(libcurl) - - pkgconfig(openssl) +context: f26-libsoup env: - CONFIGOPTS: "--with-curl --with-openssl" + CONFIGOPTS: "--without-curl --without-openssl" tests: - ci/build-check.sh diff --git a/ci/build.sh b/ci/build.sh index a9a8ac3f..2d7eb61e 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,6 +7,8 @@ dn=$(dirname $0) . ${dn}/libbuild.sh pkg_install_builddeps ostree +# Until this propagates farther +pkg_install 'pkgconfig(libcurl)' 'pkgconfig(openssl)' pkg_install sudo which attr fuse \ libubsan libasan libtsan PyYAML redhat-rpm-config \ elfutils