ci/papr: Switch primary to libcurl, add libsoup context

Sometime in the next few releases I think we should make libcurl
the default.

Prep for more CI work.

Closes: #1016
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-19 09:08:41 -04:00 committed by Atomic Bot
parent 779f125cbe
commit ebbd0b3ce6
2 changed files with 6 additions and 6 deletions

View File

@ -12,6 +12,8 @@ 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'
@ -79,14 +81,10 @@ tests:
inherit: true inherit: true
required: true required: true
context: f26-curl-openssl context: f26-libsoup
packages:
- pkgconfig(libcurl)
- pkgconfig(openssl)
env: env:
CONFIGOPTS: "--with-curl --with-openssl" CONFIGOPTS: "--without-curl --without-openssl"
tests: tests:
- ci/build-check.sh - ci/build-check.sh

View File

@ -7,6 +7,8 @@ dn=$(dirname $0)
. ${dn}/libbuild.sh . ${dn}/libbuild.sh
pkg_install_builddeps ostree pkg_install_builddeps ostree
# Until this propagates farther
pkg_install 'pkgconfig(libcurl)' 'pkgconfig(openssl)'
pkg_install sudo which attr fuse \ pkg_install sudo which attr fuse \
libubsan libasan libtsan PyYAML redhat-rpm-config \ libubsan libasan libtsan PyYAML redhat-rpm-config \
elfutils elfutils