Your message dated Sat, 10 Nov 2018 20:05:49 +0000
with message-id <[email protected]>
and subject line Bug #901172 in www.debian.org fixed
has caused the Debian Bug report #901172,
regarding update 7release-notes script to use the git repo of "release-notes"
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
901172: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901172
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
Hello,
Bug #901172 in www.debian.org reported by you has been fixed in the Git
repository.
You can see the commit message below, and you can check the diff of the fix at:
https://salsa.debian.org/webmaster-team/cron/commit/ba63c0451f5eb6b29d2c670352d598887ee94451
------------------------------------------------------------------------
adapt the release notes build script to use the git repos in Salsa. Thanks
Baptiste Jammet for providing the patch. Closes: #901172
------------------------------------------------------------------------
(this message was generated automatically)
--
Greetings
https://bugs.debian.org/901172
--- End Message ---
