diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-10-16 23:38:20 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-10-16 23:38:20 +0200 |
| commit | 48eb6070502e54d063e2d1c27f20e91db8bac1a0 (patch) | |
| tree | 6ec6770f8d5b1442c4ca0c016529c5d2af45d1fa | |
| parent | 4750fe8d3806d82f25e7cd02a950caa054512ca0 (diff) | |
| download | jenkins.debian.net-48eb6070502e54d063e2d1c27f20e91db8bac1a0.tar.xz | |
reproducible arch: only publish logs once the builds are done
| -rwxr-xr-x | bin/reproducible_build_arch_pkg.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh index b3288d94..80277a63 100755 --- a/bin/reproducible_build_arch_pkg.sh +++ b/bin/reproducible_build_arch_pkg.sh @@ -175,15 +175,9 @@ fi # build package twice mkdir b1 b2 remote_build 1 -# publish log -mkdir -p $BASE/archlinux/$SRCPACKAGE/ -cd $TMPDIR/b1/$SRCPACKAGE -cp build1.log $BASE/archlinux/$SRCPACKAGE/ # only do the 2nd build if the 1st produced some results if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz)" ] ; then remote_build 2 - cd $TMPDIR/b2/$SRCPACKAGE - cp build2.log $BASE/archlinux/$SRCPACKAGE/ # run diffoscope on the results TIMEOUT="30m" DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)" @@ -195,10 +189,16 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz)" ] ; then # publish page if [ -f $TMPDIR/$SRCPACKAGE/$ARTIFACT.html ] ; then cp $TMPDIR/$SRCPACKAGE/$ARTIFACT.html $BASE/archlinux/$SRCPACKAGE/ - echo "$(date -u) - $REPRODUCIBLE_URL/archlinux/$SRCPACKAGE/$ARTIFACT.html updated." fi done fi +# publish logs +mkdir -p $BASE/archlinux/$SRCPACKAGE/ +cd $TMPDIR/b1/$SRCPACKAGE +cp build1.log $BASE/archlinux/$SRCPACKAGE/ +cd $TMPDIR/b2/$SRCPACKAGE +[ ! -f build2.log ] || cp build2.log $BASE/archlinux/$SRCPACKAGE/ +echo "$(date -u) - $REPRODUCIBLE_URL/archlinux/$SRCPACKAGE/ updated." cd cleanup_all |