diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-10-07 20:46:48 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-10-07 20:46:48 +0200 |
| commit | b0756c284f849dba96255832955a48ba670fce2b (patch) | |
| tree | 4e59b7e88f8269a7d5adf14d591038da140a6315 | |
| parent | 8d81c0427c35b403da140332d4333f0b2882f621 (diff) | |
| download | jenkins.debian.net-b0756c284f849dba96255832955a48ba670fce2b.tar.xz | |
reproducible: improve output and grammar
| -rwxr-xr-x | bin/reproducible_stats.sh | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index c0047566..ce25953d 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -158,12 +158,12 @@ write_summary_header() { write_summary "<!DOCTYPE html><html><head>" write_summary "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />" write_summary "<link href=\"static/style.css\" type=\"text/css\" rel=\"stylesheet\" /></head>" - write_summary "<body><header><h2>Statistics for reproducible builds</h2>" + write_summary "<body><header><h2>$2</h2>" if [ "$1" = "$MAINVIEW" ] ; then - write_summary "<p>This page is updated every three hours. Results are obtained from <a href=\"$JENKINS_URL/view/reproducible\">several build jobs running on jenkins.debian.net</a>. Thanks to <a href=\"https://www.profitbricks.com\">Profitbricks</a> for donating the virtual machine it's running on!</p>" + write_summary "<p>These pages are updated every three hours. Results are obtained from <a href=\"$JENKINS_URL/view/reproducible\">several build jobs running on jenkins.debian.net</a>. Thanks to <a href=\"https://www.profitbricks.com\">Profitbricks</a> for donating the virtual machine it's running on!</p>" write_summary "<p>$COUNT_TOTAL packages attempted to build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $PERCENT_GOOD% were successful, so quite wildly guessing this roughy means about $GUESS_GOOD <a href=\"https://wiki.debian.org/ReproducibleBuilds\">packages should be reproducibly buildable!</a> Join <code>#debian-reproducible</code> on OFTC to get support for making sure your packages build reproducibly too!</p>" fi - write_summary "<p>Other views for the build results:<ul>" + write_summary "<p><ul>Other views for the build results:" for TARGET in $ALLVIEWS dd-list; do if [ "$TARGET" = "$1" ] ; then continue @@ -194,29 +194,29 @@ EXTRA_STAR=false process_packages ${UGLY["all"]} ${GOOD["all"]} MAINVIEW="last_24h" -ALLVIEWS="all last_24h last_48h" +ALLVIEWS="last_24h last_48h all" for VIEW in $ALLVIEWS ; do SUMMARY=index_${VIEW}.html echo "Starting to write $SUMMARY page." - write_summary_header $VIEW - write_summary "<p>$COUNT_BAD packages ($PERCENT_BAD% of $COUNT_TOTAL) failed to built reproducibly: <code>" + write_summary_header $VIEW "Statistics for reproducible builds of ${SPOKENTARGET[$VIEW]}" + write_summary "<p>$COUNT_BAD packages ($PERCENT_BAD% of $COUNT_TOTAL) failed to built reproducibly in total, from ${SPOKENTARGET[$VIEW]} these were: <code>" link_packages ${BAD[$VIEW]} write_summary "</code></p>" write_summary "<p><font size=\"-1\">A β sign after a package name indicates that no .buildinfo file was generated.</font></p>" write_summary - write_summary "<p>$COUNT_UGLY packages ($PERCENT_UGLY%) failed to build from source: <code>" + write_summary "<p>$COUNT_UGLY packages ($PERCENT_UGLY%) failed to build from source in total, from ${SPOKENTARGET[$VIEW]} these were: <code>" link_packages ${UGLY[$VIEW]} write_summary "</code></p>" if [ $COUNT_SOURCELESS -gt 0 ] ; then - write_summary "<p>$COUNT_SOURCELESS ($PERCENT_SOURCELESS%) packages where the source could not be downloaded. <code>${SOURCELESS[$VIEW]}</code></p>" + write_summary "<p>For $COUNT_SOURCELESS ($PERCENT_SOURCELESS%) packages in total sources could not be downloaded, from ${SPOKENTARGET[$VIEW]} these were: <code>${SOURCELESS[$VIEW]}</code></p>" fi if [ $COUNT_NOTFORUS -gt 0 ] ; then - write_summary "<p>$COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any' nor 'all' nor 'amd64' nor 'linux-amd64': <code>${NOTFORUS[$VIEW]}</code></p>" + write_summary "<p>In total there were $COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any' nor 'all' nor 'amd64' nor 'linux-amd64', from ${SPOKENTARGET[$VIEW]} these were: <code>${NOTFORUS[$VIEW]}</code></p>" fi - if [ $COUNT_BLACKLISTED -gt 0 ] ; then + if [ "$VIEW" = "all" ] && [ $COUNT_BLACKLISTED -gt 0 ] ; then write_summary "<p>$COUNT_BLACKLISTED packages are blacklisted and will never be tested here: <code>$BLACKLISTED</code></p>" fi - write_summary "<p>$COUNT_GOOD packages ($PERCENT_GOOD%) successfully built reproducibly: <code>" + write_summary "<p>$COUNT_GOOD packages ($PERCENT_GOOD%) successfully built reproducibly, from ${SPOKENTARGET[$VIEW]} these were: <code>" link_packages ${GOOD[$VIEW]} write_summary "</code></p>" write_summary_footer @@ -226,8 +226,7 @@ done VIEW=dd-list SUMMARY=index_${VIEW}.html echo "Starting to write $SUMMARY page." -write_summary_header $VIEW -write_summary "<h2>Packages which failed to build reproducibly, sorted by Maintainers: and Uploaders: fields</h2>" +write_summary_header $VIEW "Statistics for reproducible builds of ${SPOKENTARGET[$VIEW]}" write_summary "<p><pre>$(echo ${BAD["all"]} | dd-list -i) </pre></p>" write_summary_footer publish_summary |