From de6dce51480c65b2b0696cdfd297ee85327fa918 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 24 Nov 2019 20:24:41 +0100 Subject: [PATCH] reproducible Archlinux: dont fail the job if diffoscope --version fails Signed-off-by: Holger Levsen --- bin/reproducible_build_archlinux_pkg.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 7698713c..c978e7a8 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -438,13 +438,13 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the echo "

" ) > "$BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html" elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] && [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then - echo "$(date -u) - running diffoscope on the results" + echo "$(date -u) - running diffoscope on the results now:" TIMEOUT="60m" - DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)" + DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || echo 'diffoscope-unknown-version')" echo "$(date -u) - Running $DIFFOSCOPE now..." call_diffoscope $SRCPACKAGE $ARTIFACT elif [ -f $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ] || [ -f $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ] ; then - echo "$(date -u) - one of the two builds failed... delete the other one" + echo "$(date -u) - one of the two builds failed... delete the other one:" ( rm $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT || rm $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT ) 2>/dev/null else # some packages define the package version based on the build date -- GitLab