From 4d0315d978619ac761a3f9f1ae6d157ffff5a010 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 7 May 2016 13:20:01 +0200 Subject: s#http://anonscm.debian.org/cgit#https://anonscm.debian.org/git#g --- bin/reproducible_common.py | 4 ++-- bin/reproducible_common.sh | 6 +++--- bin/reproducible_html_breakages.py | 2 +- bin/reproducible_html_repository_comparison.sh | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 4e115f49..e40ea276 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -145,7 +145,7 @@ else: JOB_NAME = os.path.basename(JOB_URL[:-1]) JOB_FOOTER = 'This page was built by the jenkins job ' JOB_FOOTER += JOB_NAME+' which is configured via this ' - JOB_FOOTER += 'git repo.' + JOB_FOOTER += 'git repo.' html_footer = Template("""

@@ -157,7 +157,7 @@ html_footer = Template("""
Last update: $date. Copyright 2014-2016 Holger Levsen and many others. - The code of jenkins.debian.net.git is mostly + The code of jenkins.debian.net.git is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library. diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 84e2fc84..eb5fe913 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -322,7 +322,7 @@ write_page_intro() { write_page "

Please note that this set up is as new as December 12th, so quite some things are still lacking, eg. https://github.com/kholia/ReproducibleBuilds is not followed at all yet and there are no variations introduced for the 2nd build. Also only a subset of all source packages is currently being tested. OTOH this setup is mature enough that it requires very few trivial changes to build all 17080 source packages in $PROJECTNAME, if it were sensible. Which it isn't right now, but should be soon.

" fi if [ "$1" != "Arch Linux" ] && [ "$1" != "fedora-23" ] ; then - write_page "

There is a weekly run jenkins job to test the $BRANCH branch of $PROJECTNAME.git. The jenkins job is running reproducible_$PROJECTNAME.sh$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join #debian-reproducible (on irc.oftc.net) to request job runs whenever sensible. Patches and other feedback are very much appreciated - if you want to help, please start by looking at the ToDo list for $1, you might find something easy to contribute." + write_page "

There is a weekly run jenkins job to test the $BRANCH branch of $PROJECTNAME.git. The jenkins job is running reproducible_$PROJECTNAME.sh$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join #debian-reproducible (on irc.oftc.net) to request job runs whenever sensible. Patches and other feedback are very much appreciated - if you want to help, please start by looking at the ToDo list for $1, you might find something easy to contribute." write_page "
Thanks to Profitbricks for donating the virtual machines this is running on!

" else write_page "

FIXME: explain $PROJECTNAME test setup here.

" @@ -334,11 +334,11 @@ write_page_footer() { if [ -n "$JOB_URL" ] ; then write_page "This page was built by the jenkins job" write_page "$(basename $JOB_URL) which is configured" - write_page "via this git repo." + write_page "via this git repo." fi write_page "There is more information about jenkins.debian.net and about reproducible builds of Debian available elsewhere." write_page "
Last update: $(date +'%Y-%m-%d %H:%M %Z'). Copyright 2014-2016 Holger Levsen and many others." - write_page "The code of jenkins.debian.net.git is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library." + write_page "The code of jenkins.debian.net.git is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the Tango Icon Library." write_page "
" if [ "$1" = "coreboot" ] ; then write_page "The Coreboot logo is Copyright © 2008 by Konsult Stuge and coresystems GmbH and can be freely used to refer to the Coreboot project." diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py index 8b653b23..f7993927 100755 --- a/bin/reproducible_html_breakages.py +++ b/bin/reproducible_html_breakages.py @@ -316,7 +316,7 @@ if __name__ == '__main__': html = '

This page lists unexpected things a human should look at and ' html += 'fix, like packages with an incoherent status or files that ' html += 'should not be there. Some of these breakages are caused by ' - html += 'bugs in diffoscope ' + html += 'bugs in diffoscope ' html += 'while others are probably due to bugs in the scripts run by jenkins. ' html += 'Please help making this page empty!

\n' breakages = gen_html() diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh index 9b72498d..194a777d 100755 --- a/bin/reproducible_html_repository_comparison.sh +++ b/bin/reproducible_html_repository_comparison.sh @@ -161,18 +161,18 @@ for PKG in $SOURCEPKGS ; do GIT="$PKG.git" case $PKG in debbindiff) - URL="http://anonscm.debian.org/cgit/reproducible/diffoscope.git" + URL="https://anonscm.debian.org/git/reproducible/diffoscope.git" GIT="diffoscope.git" ;; strip-nondeterminism|diffoscope|disorderfs) - URL="http://anonscm.debian.org/cgit/reproducible/$GIT" ;; + URL="https://anonscm.debian.org/git/reproducible/$GIT" ;; *) - URL="http://anonscm.debian.org/cgit/reproducible/$GIT/?h=pu/reproducible_builds" ;; + URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=pu/reproducible_builds" ;; esac custom_curl $URL $TMPFILE if [ "$(grep "'error'>No repositories found" $TMPFILE 2>/dev/null)" ] ; then write_row "no git repository found:
$URL" elif [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then - URL="http://anonscm.debian.org/cgit/reproducible/$GIT/?h=merged/reproducible_builds" + URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=merged/reproducible_builds" custom_curl $URL $TMPFILE if [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then if ! $OBSOLETE_IN_SID ; then -- cgit v1.2.3-70-g09d2