From c353e496ea99b8371ae3271fb4198b99b1be09a0 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 2 Sep 2022 16:30:32 +0200 Subject: [PATCH] More robust Debian dependency installation We want it to complain loudly if a dependency is missing, not just quietly continue on. --- .github/containers/bionic/build.sh | 5 ++--- .github/containers/focal/build.sh | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh index 243c3f95..32c844f7 100755 --- a/.github/containers/bionic/build.sh +++ b/.github/containers/bionic/build.sh @@ -47,10 +47,9 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/ bash -e -x -c " tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz; cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian; - mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; - sudo dpkg --unpack ~/tigervnc-build-deps_*.deb; sudo apt-get update; - sudo apt-get -f install -y; + mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; + sudo apt-get install -y ~/tigervnc-build-deps_*.deb; cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage; " diff --git a/.github/containers/focal/build.sh b/.github/containers/focal/build.sh index 9041ca25..90ff2c4d 100755 --- a/.github/containers/focal/build.sh +++ b/.github/containers/focal/build.sh @@ -47,10 +47,9 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/ bash -e -x -c " tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz; cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian; - mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; - sudo dpkg --unpack ~/tigervnc-build-deps_*.deb; sudo apt-get update; - sudo apt-get -f install -y; + mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; + sudo apt-get install -y ~/tigervnc-build-deps_*.deb; cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage; " -- 2.39.5