Package: www.debian.org Severity: normal User: [email protected] Usertags: scripts Tags: patch X-Debbugs-CC: [email protected]
Hello all The "often" cron job for building the release notes (for the Debian website) currently fails because it's still using svn and alioth. Here is the log: https://www-master.debian.org/build-logs/webwml/release-notes.log and its content: Sat Jun 9 16:55:05 UTC 2018 rebuilding the release notes for wheezy Updating '.': svn: E170013: Unable to connect to a repository at URL 'svn://svn.debian.org/svn/ddp/manuals/branches/release-notes/wheezy' svn: E670002: Unknown hostname 'svn.debian.org' The job script is here: https://salsa.debian.org/webmaster-team/cron/blob/master/parts/7release-notes I'm attaching a patch to update the job to use git. Reviews are appreciated. Some notes: 1.- With svn we had one folder for each branch that was storing the release notes of one release. So, now we have this structure in www-master.debian.org: /srv/www.debian.org/release-notes /srv/www.debian.org/release-notes/stretch /srv/www.debian.org/release-notes/jessie /srv/www.debian.org/release-notes/wheezy /srv/www.debian.org/release-notes/squeeze /srv/www.debian.org/release-notes/lenny /srv/www.debian.org/release-notes/etch /srv/www.debian.org/release-notes/build.log /srv/www.debian.org/release-notes/build.log.* In git we have branches but everything is in the same folder. So in my patch I assume that we have a clone of the release-notes repo, and thus we would have this structure in www-master.debian.org: /srv/www.debian.org/release-notes /srv/www.debian.org/release-notes/release-notes (git repo) /srv/www.debian.org/release-notes/build.log /srv/www.debian.org/release-notes/build.log.* and use git checkout to each release (branch). 2.- I have cloned locally the release-notes repo to try to test my changes to the cron script, but the local build fails. I will file a separate bug about this against release-notes. When that issue is fixed I will try to build the notes locally and test my patch, but in the meanwhile any comment is welcome. Cheers -- Laura Arjona Reina https://wiki.debian.org/LauraArjona
From f143f2a3e7f7e7c918664d050b22008a03be241a Mon Sep 17 00:00:00 2001 From: Laura Arjona Reina <[email protected]> Date: Sat, 9 Jun 2018 20:37:42 +0200 Subject: [PATCH] Update 7release-notes script to use the git repo in Salsa --- parts/7release-notes | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/parts/7release-notes b/parts/7release-notes index 395607f..664da58 100755 --- a/parts/7release-notes +++ b/parts/7release-notes @@ -13,18 +13,13 @@ date > $notesdir/build.log # Add the release name once released/branched out of trunk for release in wheezy jessie stretch ; do echo "rebuilding the release notes for $release" >> $notesdir/build.log - if ! [ -d "$notesdir/$release" ] ; then - echo "directory $notesdir/$release does not exist. checking out SVN" >> $notesdir/build.log - cd $notesdir - if [ "$release" = "stretch" ]; then - svn checkout svn://svn.debian.org/svn/ddp/manuals/trunk/release-notes $release >> $notesdir/build.log 2>&1 - else - svn checkout svn://svn.debian.org/svn/ddp/manuals/branches/release-notes/$release >> $notesdir/build.log 2>&1 - fi + cd $notesdir/release-notes + if [ "$release" = "stretch" ]; then + git checkout master && git pull >> $notesdir/build.log 2>&1 else - (cd $notesdir/$release && svn update) >> $notesdir/build.log 2>&1 + git checkout $release && git pull >> $notesdir/build.log 2>&1 fi - make -C $notesdir/$release publish \ + make -C $notesdir/release-notes publish \ PUBLISHTARBALL=yes PUBLISHDIR=$webtopdir/www/releases/$release >> $notesdir/build.log 2>&1 done -- 2.11.0
