Skip to content

Commit

Permalink
ci/travis: Add a curl context
Browse files Browse the repository at this point in the history
I arbitrarily picked Debian Jessie rather than duplicating
this matrix.  Not totally sure of the value of doing both
Ubuntu and Debian here for example.
  • Loading branch information
cgwalters committed Jan 10, 2017
1 parent f899acd commit a915364
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ sudo: required
env:
- ci_distro=ubuntu ci_suite=trusty
- ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie
- ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie ci_configopts="--with-curl"
- ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch
- ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial

Expand Down
6 changes: 6 additions & 0 deletions tests/ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,18 @@ NULL=
# If yes, test failures break the build; if no, they are reported but ignored
: "${ci_test_fatal:=yes}"

# ci_configopts:
# Additional args for configure
: "${ci_configopts:=}"

if [ -n "$ci_docker" ]; then
exec docker run \
--env=ci_docker="" \
--env=ci_parallel="${ci_parallel}" \
--env=ci_sudo=yes \
--env=ci_test="${ci_test}" \
--env=ci_test_fatal="${ci_test_fatal}" \
--env=ci_configopts="${ci_configopts}" \
--privileged \
ci-image \
tests/ci-build.sh
Expand All @@ -81,6 +86,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
../configure \
--enable-always-build-tests \
--enable-installed-tests \
${ci_configopts}
"$@"

${make}
Expand Down
4 changes: 4 additions & 0 deletions tests/ci-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ NULL=
# Typical values for ci_distro=fedora might be 25, rawhide
: "${ci_suite:=jessie}"

# ci_configopts: Additional arguments for configure
: "${ci_configopts:=}"

if [ $(id -u) = 0 ]; then
sudo=
else
Expand Down Expand Up @@ -104,6 +107,7 @@ case "$ci_distro" in
libmount-dev \
libselinux1-dev \
libsoup2.4-dev \
libcurl4-openssl-dev \
procps \
zlib1g-dev \
${NULL}
Expand Down

0 comments on commit a915364

Please sign in to comment.