shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

travis: Add some libsodium coverage

Browse Source 
As far as I can tell we're not gating on this right now.  From
a quick glance, it looks like Debian stable has `libsodium-dev`
but only Ubuntu eoan does which we're not testing right now.
This commit is contained in:
Colin Walters 2020-04-15 22:16:58 +00:00
parent fd55deb0f7
commit e63647c6d0
3 changed files with 6 additions and 3 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

2
ci/travis-install.sh
View File

@ -64,6 +64,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 +112,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