Date: Sun, 1 Oct 2017 19:26:53 +0000 (UTC) From: Wolfram Schneider <wosch@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51018 - head/share/tools Message-ID: <201710011926.v91JQrf0003512@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wosch Date: Sun Oct 1 19:26:53 2017 New Revision: 51018 URL: https://svnweb.freebsd.org/changeset/doc/51018 Log: display the latest rev. nummber / git id on failure PR: 222721 Modified: head/share/tools/webupdate Modified: head/share/tools/webupdate ============================================================================== --- head/share/tools/webupdate Sun Oct 1 18:08:22 2017 (r51017) +++ head/share/tools/webupdate Sun Oct 1 19:26:53 2017 (r51018) @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2001 Wolfram Schneider <wosch@FreeBSD.org> +# Copyright (c) 2001-2017 Wolfram Schneider <wosch@FreeBSD.org> # Copyright (c) 2001 Dima Dorfman <dd@FreeBSD.org> # # Update the FreeBSD web site from the SVN repository. @@ -70,6 +70,8 @@ BUILDARGS=${BUILDARGS:-${DEFAULT_BUILDARGS}}; INSTARGS="${BUILDARGS} ${INSTARGS:-${DEFAULT_INSTARGS}}"; WEBMAILTO=${WEBMAILTO:-${DEFAULT_WEBMAILTO}}; +#export NO_OBJ=YES + # Notes on the names of the release notes directories: # # - They weren't named the same way they will be on the web site @@ -158,15 +160,21 @@ fi # cd $BUILDDIR/head || exit 1; +# get latest revision +LATESTREVISION=$LOGDIR/LATESTREVISION +make -C en_US.ISO8859-1/articles/pam/ SRCS="$(pwd)" -V LATESTREVISION | \ + perl -npe 's,--stringparam\s+,\n,g' > $LATESTREVISION + time make ${BUILDARGS} p-all >> $LOGFILE 2>&1 || - (tail -50 $LOGFILE | - mail -s "FreeBSD web build failed on `hostname`" $WEBMAILTO; + (cat $LATESTREVISION >> $LOGFILE + tail -50 $LOGFILE | mail -s "FreeBSD web build failed on `hostname`" $WEBMAILTO; exit 3) || exit 3; cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1; ( time make ${INSTARGS} all && time make ${INSTARGS} install ) >> $LOGFILE 2>&1 || - (tail -50 $LOGFILE | + (cat $LATESTREVISION >> $LOGFILE + tail -50 $LOGFILE | mail -s "FreeBSD web build failed on `hostname`" $WEBMAILTO; exit 3) || exit 3; @@ -179,6 +187,7 @@ fi #gzip -f $LOGFILE #find $LOGDIR -mtime +60 -print0 | perl -n0e unlink +cat $LATESTREVISION >> ${LOGFILE} buildstop=`date +%s` buildd=$(($buildstop - $buildstart)) echo "Build ended `date` (${buildd}s)" >> ${LOGFILE}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710011926.v91JQrf0003512>