From d4147b7e353dde732410df17eef63475139e61d3 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 8 Apr 2021 11:45:13 -0600 Subject: [PATCH 1/2] travis: Correct ci_suite settings for buster The install script no longer uses this anymore and maybe it should just be removed, but in the meantime it should at least be correct. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f3ef055..986c1a19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ sudo: required env: # 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-ed25519-libsodium" ci_pkgs="libsodium-dev" - - ci_docker=debian:buster-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-curl --with-ed25519-libsodium --without-gpgme" ci_pkgs="libsodium-dev" + - ci_docker=debian:buster-slim ci_distro=debian ci_suite=buster ci_configopts="--with-ed25519-libsodium" ci_pkgs="libsodium-dev" + - ci_docker=debian:buster-slim ci_distro=debian ci_suite=buster ci_configopts="--with-curl --with-ed25519-libsodium --without-gpgme" ci_pkgs="libsodium-dev" - ci_docker=ubuntu:focal ci_distro=ubuntu ci_suite=focal - ci_docker=ubuntu:groovy ci_distro=ubuntu ci_suite=groovy From ed16443c829e8e607120752af34072fdf5fd4e78 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 8 Apr 2021 11:49:19 -0600 Subject: [PATCH 2/2] travis: Add back a 32 bit i386 build Although people are likely not deploying on 32 bit x86 anymore, deploying on 32 bit armv7 is still often used. Add back an i386 build on debian to try to catch 32 bit bugs in CI. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 986c1a19..10d8e4bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ env: # debian has libsodium-dev, ubuntu doesn't in core at least - ci_docker=debian:buster-slim ci_distro=debian ci_suite=buster ci_configopts="--with-ed25519-libsodium" ci_pkgs="libsodium-dev" - ci_docker=debian:buster-slim ci_distro=debian ci_suite=buster ci_configopts="--with-curl --with-ed25519-libsodium --without-gpgme" ci_pkgs="libsodium-dev" + # A 32 bit build to act as a proxy for frequently deployed 32 bit armv7 + - ci_docker=i386/debian:buster-slim ci_distro=debian ci_suite=buster - ci_docker=ubuntu:focal ci_distro=ubuntu ci_suite=focal - ci_docker=ubuntu:groovy ci_distro=ubuntu ci_suite=groovy