From ac4444b52873b827dae5eed351f707a414efc66a Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Fri, 28 Aug 2020 10:16:38 -0500 Subject: [PATCH] trivial: debian ci: don't use packaging when subproject active This prevents carrying hacks in the packaging specific to CI things that will never actually land in Debian. This will keep CI availability high while new packages are not yet actually landed into Debian. --- contrib/ci/debian.sh | 8 ++++++++ contrib/ci/ubuntu.sh | 1 + 2 files changed, 9 insertions(+) diff --git a/contrib/ci/debian.sh b/contrib/ci/debian.sh index 0853b3a96..64d77c6ae 100755 --- a/contrib/ci/debian.sh +++ b/contrib/ci/debian.sh @@ -23,6 +23,14 @@ sed s/quilt/native/ debian/source/format -i #generate control file ./contrib/ci/generate_debian.py +#check if we have all deps available +#if some are missing, we're going to use subproject instead and +#packaging CI will fail +if ! dpkg-checkbuilddeps; then + ./contrib/ci/ubuntu.sh + exit 0 +fi + #clone test firmware if [ "$CI_NETWORK" = "true" ]; then ./contrib/ci/get_test_firmware.sh diff --git a/contrib/ci/ubuntu.sh b/contrib/ci/ubuntu.sh index a80464160..d5e8a191b 100755 --- a/contrib/ci/ubuntu.sh +++ b/contrib/ci/ubuntu.sh @@ -9,6 +9,7 @@ if [ "$CI_NETWORK" = "true" ]; then fi #evaluate using Ubuntu's buildflags +#evaluate using Debian/Ubuntu's buildflags eval "$(dpkg-buildflags --export=sh)" #filter out -Bsymbolic-functions export LDFLAGS=$(dpkg-buildflags --get LDFLAGS | sed "s/-Wl,-Bsymbolic-functions\s//")