More verbose output for container builds

MithrandirD · Sep 3, 2022 · 6645558 · 6645558
1 parent 645c1f2
commit 6645558
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh
@@ -44,14 +44,14 @@ cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog
 ## Start the build
 
 docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/${DOCKER} \
-	bash -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 &&
-	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage
+	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;
+	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage;
 	"
 
 mkdir -p ${CURDIR}/result

diff --git a/.github/containers/centos7/build.sh b/.github/containers/centos7/build.sh
@@ -32,12 +32,12 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec
 ## Start the build
 
 docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \
-	bash -c "
-	sudo yum install -y epel-release &&
-	sudo yum-builddep -y ~/rpmbuild/SPECS/tigervnc.spec &&
-        sudo chown 0.0 ~/rpmbuild/SOURCES/* &&
-        sudo chown 0.0 ~/rpmbuild/SPECS/* &&
-	rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec
+	bash -e -x -c "
+	sudo yum install -y epel-release;
+	sudo yum-builddep -y ~/rpmbuild/SPECS/tigervnc.spec;
+	sudo chown 0.0 ~/rpmbuild/SOURCES/*;
+	sudo chown 0.0 ~/rpmbuild/SPECS/*;
+	rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec;
 	"
 
 mkdir -p ${CURDIR}/result

diff --git a/.github/containers/centos8/build.sh b/.github/containers/centos8/build.sh
@@ -32,11 +32,11 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec
 ## Start the build
 
 docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \
-	bash -c "
-	sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec &&
-        sudo chown 0.0 ~/rpmbuild/SOURCES/* &&
-        sudo chown 0.0 ~/rpmbuild/SPECS/* &&
-	rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec
+	bash -e -x -c "
+	sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec;
+	sudo chown 0.0 ~/rpmbuild/SOURCES/*;
+	sudo chown 0.0 ~/rpmbuild/SPECS/*;
+	rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec;
 	"
 
 mkdir -p ${CURDIR}/result

diff --git a/.github/containers/focal/build.sh b/.github/containers/focal/build.sh
@@ -44,14 +44,14 @@ cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog
 ## Start the build
 
 docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/${DOCKER} \
-	bash -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 &&
-	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage
+	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;
+	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage;
 	"
 
 mkdir -p ${CURDIR}/result