From 423270e98b0fc180cfa9b1497d0bbb27b1e612fd Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Wed, 18 Nov 2020 08:17:43 -0600 Subject: [PATCH] trivial: explicitly install missing dependencies in `ubuntu.sh` If a new dependency is added but not present in the container, `debian.sh` will abort trying to use packaging, which will cause `ubuntu.sh` to executed. Rather than fail the build, try to install anything missing. This helps with the split CI where the containers are re-generated nightly. --- contrib/ci/ubuntu.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/ci/ubuntu.sh b/contrib/ci/ubuntu.sh index 38ac943b5..2838fac24 100755 --- a/contrib/ci/ubuntu.sh +++ b/contrib/ci/ubuntu.sh @@ -8,6 +8,9 @@ if [ "$CI_NETWORK" = "true" ]; then export G_TEST_SRCDIR=`pwd`/fwupd-test-firmware/installed-tests fi +#check for and install missing dependencies +./contrib/ci/generate_dependencies.py | xargs apt install -y + #evaluate using Ubuntu's buildflags #evaluate using Debian/Ubuntu's buildflags eval "$(dpkg-buildflags --export=sh)"