packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Enable libcurl by default on Fedora 

The insttest fell over since its build used libsoup, but that just dropped out
of FAH.

Closes: #1030
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-26 15:51:57 -04:00 committed by Atomic Bot
parent e09fc83ab3
commit f1f199578e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.papr.yml
View File

@ -12,8 +12,6 @@ packages:
- git - git
env: env:
# At some point soon will encourage distros to use libcurl
CONFIGOPTS: "--with-curl --with-openssl"
# Enable all the sanitizers for this primary build. # Enable all the sanitizers for this primary build.
# We only use -Werror=maybe-uninitialized here with a "fixed" toolchain # 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' CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@ -85,7 +83,7 @@ required: true
context: f26-libsoup context: f26-libsoup
env: env:
CONFIGOPTS: "--without-curl --without-openssl" CONFIGOPTS: "--without-curl --without-openssl --with-libsoup"
tests: tests:
- ci/build-check.sh - ci/build-check.sh
@ -98,7 +96,6 @@ required: true
context: f26-introspection-tests context: f26-introspection-tests
env: env:
CONFIGOPTS: "--with-curl --with-openssl"
# ASAN conflicts with introspection testing; # ASAN conflicts with introspection testing;
# See https://github.com/ostreedev/ostree/issues/1014 # See https://github.com/ostreedev/ostree/issues/1014
INSTALLED_TESTS_PATTERN: "libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js" INSTALLED_TESTS_PATTERN: "libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js"

7
ci/build.sh
View File

@ -21,4 +21,11 @@ DETECTED_CONFIGOPTS=
if test -x /usr/bin/gnome-desktop-testing-runner; then if test -x /usr/bin/gnome-desktop-testing-runner; then
DETECTED_CONFIGOPTS="${DETECTED_CONFIGOPTS} --enable-installed-tests=exclusive" DETECTED_CONFIGOPTS="${DETECTED_CONFIGOPTS} --enable-installed-tests=exclusive"
fi 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*) ;;
*) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
esac
fi
build --enable-gtk-doc ${DETECTED_CONFIGOPTS} ${CONFIGOPTS:-} build --enable-gtk-doc ${DETECTED_CONFIGOPTS} ${CONFIGOPTS:-}