diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-05 14:42:00 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-05 14:42:00 +0100 |
| commit | d37105b45619b11175a680830363c51e1b0541a5 (patch) | |
| tree | 4764dc3ebbed09e39281d997379ed5f095042942 | |
| parent | 4fed3e2ded77218518255be81057c7cad203dab0 (diff) | |
| download | jenkins.debian.net-d37105b45619b11175a680830363c51e1b0541a5.tar.xz | |
reproducible: several small tweaks to page headers
| -rwxr-xr-x | bin/reproducible_common.sh | 11 | ||||
| -rwxr-xr-x | bin/reproducible_html_graphs.sh | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 583c934f..5e9a9b71 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -91,7 +91,7 @@ init_html() { SPOKENTARGET["suite_stats"]="$SUITE stats" SPOKENTARGET["repo_stats"]="repositories overview" SPOKENTARGET["stats"]="reproducible stats" - # query some data we need everywhere + # FIXME: this can probably all go into html_graph.sh now...: query some data we need everywhere AMOUNT=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT count(*) FROM sources WHERE suite=\"${SUITE}\"") COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\"") COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\" AND r.status=\"reproducible\"") @@ -140,12 +140,11 @@ write_page_header() { write_page "<link href=\"/userContent/static/style.css\" type=\"text/css\" rel=\"stylesheet\" />" write_page "<title>$2</title></head>" write_page "<body><header><h2>$2</h2>" - if [ "$1" = "$MAINVIEW" ] || [ "$1" = "suite_stats" ] ; then - write_page "<p>These pages contain results obtained from <a href=\"$JENKINS_URL/view/reproducible\">several jobs running on jenkins.debian.net</a>. Thanks to <a href=\"https://www.profitbricks.com\">Profitbricks</a> for donating the virtual machine this is running on!</p>" + if [ "$1" = "$MAINVIEW" ] ; then + write_page "<p>These pages are showing the prospects of <a href=\"https://wiki.debian.org/ReproducibleBuilds\">reproducible builds of Debian packages</a>. The results shown were obtained from <a href=\"$JENKINS_URL/view/reproducible\">several jobs running on jenkins.debian.net</a>. Thanks to <a href=\"https://www.profitbricks.com\">Profitbricks</a> for donating the virtual machine this is running on!</p>" fi - if [ "${1:0:3}" = "all" ] || [ "$1" = "dd-list" ] || [ "$1" = "stats" ] || [ "$1" = "suite_stats" ] ; then - write_page "<p>$COUNT_TOTAL packages have been attempted to be build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $COUNT_GOOD packages ($PERCENT_GOOD%) <a href=\"https://wiki.debian.org/ReproducibleBuilds\">could be built reproducible!</a>" - write_page " Join <code>#debian-reproducible</code> on OFTC to get support for making sure your packages build reproducibly too!" + if [ "$1" = "dd-list" ] || [ "$1" = "stats" ] ; then + write_page " Join <code>#debian-reproducible</code> on OFTC or <a href="mailto:reproducible-builds@lists.alioth.debian.org">send us an email</a> to get support for making sure your packages build reproducibly too!" write_page "</p>" fi write_page "<ul><li>Have a look at:</li>" diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index 236fd5f5..fa8e20c3 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -282,6 +282,9 @@ VIEW=suite_stats PAGE=index_${VIEW}.html echo "$(date) - starting to write $PAGE page." write_page_header $VIEW "Overview of various statistics about reproducible builds for $SUITE" +if [ $PERCENT_TOTAL -lt 98 ] ; then + write_page "<p>$COUNT_TOTAL packages have been attempted to be build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $COUNT_GOOD packages ($PERCENT_GOOD%) <a href=\"https://wiki.debian.org/ReproducibleBuilds\">could be built reproducible!</a>" +fi write_page "<p>" set_icon reproducible write_icon |