More robust Debian dependency installation

We want it to complain loudly if a dependency is missing, not just quietly continue on.
MithrandirD · Sep 3, 2022 · c353e49 · c353e49
1 parent 6645558
commit c353e49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;
 	"