From ca6c94656f122a95eda0de5c5247f90af3e61949 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 10 Oct 2014 14:26:27 +0200 Subject: reproducible: properly use CSS styles --- TODO | 4 +--- bin/reproducible_stats.sh | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/TODO b/TODO index 870a2b19..93283931 100644 --- a/TODO +++ b/TODO @@ -110,14 +110,12 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian *** killer job is run before setup *** scheduler and builder jobs are started after -* bugs / todo -** reschedule hurd-libfuse +* bugs ** when notes are removed the navigation pages are not updated... (touch note_new on create, then on next run delete on all navi pages for which note_new exists) *** modify packages.yml locally to test... * CSS/HTML ** use iframes -** use font class=small statt size=+1 ** use icons within index pages (refactor to get rid of that case statement, use array instead) ** use css class to mark packages with notes, underline them. explain HAS_NOTE on every page which has them... diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index 2572b961..58dd43e0 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -214,9 +214,9 @@ create_pkg_note() { fi echo "" >> ${NOTE} echo " " >> ${NOTE} - echo "" >> ${NOTE} + echo "" >> ${NOTE} echo "Notes are stored in notes.git." >> ${NOTE} - echo "" >> ${NOTE} + echo "" >> ${NOTE} } PACKAGES_WITH_NOTES=$(cat ${PACKAGES_YML} | /srv/jenkins/bin/shyaml keys) @@ -307,10 +307,10 @@ init_navi_frame() { echo "" > $NAVI echo "" >> $NAVI echo "Navigation for $1" >> $NAVI - echo "
$1 $2" >> $NAVI + echo "
$1 $2" >> $NAVI set_icon "$3" $5 echo "\"${STATE_TARGET_NAME}" >> $NAVI - echo "at $4: " >> $NAVI + echo "at $4: " >> $NAVI } append2navi_frame() { @@ -318,7 +318,7 @@ append2navi_frame() { } finish_navi_frame() { - echo "reproducible builds
" >> $NAVI + echo "		reproducible builds
" >> $NAVI } process_packages() { @@ -330,7 +330,7 @@ process_packages() { # remove epoch EVERSION=$(echo $VERSION | cut -d ":" -f2) if $BUILDINFO_SIGNS && [ -f "/var/lib/jenkins/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" ] ; then - STAR[$PKG]="β" # used to be a star... + STAR[$PKG]="β" # used to be a star... fi # only build $PKG pages if they don't exist or are older than $BUILD_DATE NAVI="/var/lib/jenkins/userContent/rb-pkg/${PKG}_navigation.html" @@ -429,13 +429,13 @@ write_summary_header() { } write_summary_footer() { - write_summary "

About jenkins.debian.net in general and about reproducible builds of Debian. Last update: $(date). Copyright 2014 Holger Levsen, GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library." - write_summary "

" + write_summary "

There is more information about jenkins.debian.net and about reproducible builds of Debian available elsewhere. Last update: $(date +'%Y-%m-%d %H:%M %Z'). Copyright 2014 Holger Levsen, GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library.

" + write_summary "" } write_summary_beta_sign() { - write_summary "

A β sign after a package which is unreproducible indicates that a .buildinfo file was generated." - write_summary "This means the basics for building packages reproducibly are covered :-)

" + write_summary "

A β sign after a package which is unreproducible indicates that a .buildinfo file was generated." + write_summary "This means the basics for building packages reproducibly are covered :-)

" } publish_summary() { cp $SUMMARY /var/lib/jenkins/userContent/ @@ -524,7 +524,7 @@ force_package_targets $PACKAGES_WITH_NOTES PACKAGES_WITH_NOTES=$(echo $PACKAGES_WITH_NOTES | sed -s "s# #\n#g" | sort | xargs echo) link_packages $PACKAGES_WITH_NOTES write_summary "

" -write_summary "

Notes are stored in notes.git." +write_summary "

Notes are stored in notes.git.

" write_summary_footer publish_summary -- cgit v1.2.3-70-g09d2