From owner-svn-doc-head@freebsd.org Sun Oct 1 19:26:54 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3D4BE2CA03; Sun, 1 Oct 2017 19:26:54 +0000 (UTC) (envelope-from wosch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 829126BB94; Sun, 1 Oct 2017 19:26:54 +0000 (UTC) (envelope-from wosch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v91JQrJ8003513; Sun, 1 Oct 2017 19:26:53 GMT (envelope-from wosch@FreeBSD.org) Received: (from wosch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v91JQrf0003512; Sun, 1 Oct 2017 19:26:53 GMT (envelope-from wosch@FreeBSD.org) Message-Id: <201710011926.v91JQrf0003512@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wosch set sender to wosch@FreeBSD.org using -f From: Wolfram Schneider Date: Sun, 1 Oct 2017 19:26:53 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51018 - head/share/tools X-SVN-Group: doc-head X-SVN-Commit-Author: wosch X-SVN-Commit-Paths: head/share/tools X-SVN-Commit-Revision: 51018 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Oct 2017 19:26:54 -0000 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 +# Copyright (c) 2001-2017 Wolfram Schneider # Copyright (c) 2001 Dima Dorfman # # 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}