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

Merge pull request #2070 from cgwalters/travis-libsodium 

travis: Add some libsodium coverage
This commit is contained in:
OpenShift Merge Robot 2020-04-16 15:08:44 -07:00 committed by GitHub
parent 5092a8feac a17cdec936
commit 388c3033bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -3,8 +3,9 @@ dist: trusty
sudo: required sudo: required
env: env:
- ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch # debian has libsodium-dev, ubuntu doesn't in core at least
- ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-curl" - ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-libsodium" ci_pkgs="libsodium-dev"
- ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-curl --with-libsodium --without-gpgme" ci_pkgs="libsodium-dev"
- ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial - ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial
- ci_docker=ubuntu:bionic ci_distro=ubuntu ci_suite=bionic - ci_docker=ubuntu:bionic ci_distro=ubuntu ci_suite=bionic

2
ci/travis-Dockerfile.in
View File

@ -2,7 +2,7 @@ FROM @ci_docker@
ENV container docker ENV container docker
ADD ci/travis-install.sh /travis-install.sh ADD ci/travis-install.sh /travis-install.sh
RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_in_docker=yes /travis-install.sh RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_pkgs="@ci_pkgs@" ci_in_docker=yes /travis-install.sh
ADD . /home/user/ostree ADD . /home/user/ostree
RUN chown -R user:user /home/user/ostree RUN chown -R user:user /home/user/ostree

4
ci/travis-build.sh
View File

@ -85,13 +85,13 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
../configure \ ../configure \
--enable-always-build-tests \ --enable-always-build-tests \
${ci_configopts} ${ci_configopts} \
"$@" "$@"
${make} ${make}
[ "$ci_test" = no ] || ${make} check || maybe_fail_tests [ "$ci_test" = no ] || ${make} check || maybe_fail_tests
cat test-suite.log || : cat test-suite.log || :
[ "$ci_test" = no ] || ${make} distcheck || maybe_fail_tests [ "$ci_test" = no ] || ${make} distcheck DISTCHECK_CONFIGURE_FLAGS="${ci_configopts}" || maybe_fail_tests
cat test-suite.log || : cat test-suite.log || :
${make} install DESTDIR=$(pwd)/DESTDIR ${make} install DESTDIR=$(pwd)/DESTDIR

5
ci/travis-install.sh
View File

@ -53,6 +53,9 @@ NULL=
# ci_configopts: Additional arguments for configure # ci_configopts: Additional arguments for configure
: "${ci_configopts:=}" : "${ci_configopts:=}"
# ci_pkgs: Additional packages to be installed
: "${ci_pkgs:=}"
if [ $(id -u) = 0 ]; then if [ $(id -u) = 0 ]; then
sudo= sudo=
else else
@ -64,6 +67,7 @@ if [ -n "$ci_docker" ]; then
-e "s/@ci_distro@/${ci_distro}/" \ -e "s/@ci_distro@/${ci_distro}/" \
-e "s/@ci_docker@/${ci_docker}/" \ -e "s/@ci_docker@/${ci_docker}/" \
-e "s/@ci_suite@/${ci_suite}/" \ -e "s/@ci_suite@/${ci_suite}/" \
-e "s/@ci_pkgs@/${ci_pkgs}/" \
< ci/travis-Dockerfile.in > Dockerfile < ci/travis-Dockerfile.in > Dockerfile
exec docker build -t ci-image . exec docker build -t ci-image .
fi fi
@ -111,6 +115,7 @@ case "$ci_distro" in
procps \ procps \
zlib1g-dev \ zlib1g-dev \
python3-yaml \ python3-yaml \
${ci_pkgs:-} \
${NULL} ${NULL}
if [ "$ci_in_docker" = yes ]; then if [ "$ci_in_docker" = yes ]; then