More verbose output for container builds

diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh
index ebbc50c473f4847f9033de561eb64fdd0541ae5b..243c3f95b3f4284adc2aaef009e078800ce3b844 100755 (executable)
--- 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
index 6d1f93648a8ecec52c898900e48833d31b251fb1..883e8b65f59a4cdaf6e90054d6af6bfd052d5009 100755 (executable)
--- 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
index cf8a82c39d36464f28555c39255e0e76366ff000..1e5e0d8f428938af05e4441c7c1d32c082d53e6e 100755 (executable)
--- 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
index 3e6e5c0910f11d88a10994b8ede11cbf1bb963dc..9041ca25da93e5d0e8b707637d2a0b39586c2695 100755 (executable)
--- 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