summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-11-21 20:30:12 +0000
committerHolger Levsen <holger@layer-acht.org>2017-11-21 20:30:12 +0000
commit96fd9fcd09a28782ccd4b6ec3733b3a9a3b5dcbb (patch)
tree09e2fe730bb2be6597570c86984d9ef1391bd9f0
parent026431ca89f8b0bbfbfe579e3815b1bcf930efd0 (diff)
downloadjenkins.debian.net-96fd9fcd09a28782ccd4b6ec3733b3a9a3b5dcbb.tar.xz
reproducible Arch Linux: fix filepath and improve HTML
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_build_archlinux_pkg.sh3
-rwxr-xr-xbin/reproducible_html_archlinux.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 5a35c757..89ca4e98 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -333,8 +333,9 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the
if diff -q $TMPDIR/b1/$SRCPACKAGE/$ARTIFACT $TMPDIR/b2/$SRCPACKAGE/$ARTIFACT ; then
echo "$(date -u) - YAY - $SRCPACKAGE/$ARTIFACT build reproducible in our test framework!"
mkdir -p $BASE/archlinux/$REPOSITORY/$SRCPACKAGE
- echo "$SRCPACKAGE/$ARTIFACT build reproducible in our test framework:" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html
+ echo "<html><body><p>$SRCPACKAGE/$ARTIFACT build reproducible in our test framework:<br />" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html
(cd $TMPDIR/b1/ ; sha256sum $SRCPACKAGE/$ARTIFACT >> $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html )
+ echo "</p></body>" > $BASE/archlinux/$REPOSITORY/$SRCPACKAGE/$ARTIFACT.html
else
# run diffoscope on the results
TIMEOUT="30m"
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index fa2987de..80696a28 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -121,7 +121,7 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
else
HTML_TARGET=$HTML_GOOD
for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html) ; do
- if [ ! -z "$(grep 'build reproducible in our test framework' $ARCHLINUX_PKG_PATH/$ARTIFACT.html)" ] ; then
+ if [ ! -z "$(grep 'build reproducible in our test framework' $ARCHLINUX_PKG_PATH/$ARTIFACT)" ] ; then
let NR_GOOD+=1
echo " <img src=\"/userContent/static/weather-clear.png\" alt=\"reproducible icon\" /> <a href=\"/archlinux/$REPOSITORY/$PKG/$ARTIFACT\">${ARTIFACT:0:-5}</a> is reproducible<br />" >> $HTML_BUFFER
else