From cvs-return-34260-archive-asf-public=cust-asf.ponee.io@incubator.apache.org Tue Mar 19 00:30:22 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 72D5518077A for ; Tue, 19 Mar 2019 01:30:22 +0100 (CET) Received: (qmail 75694 invoked by uid 500); 19 Mar 2019 00:30:21 -0000 Mailing-List: contact cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: general@incubator.apache.org Delivered-To: mailing list cvs@incubator.apache.org Received: (qmail 75685 invoked by uid 99); 19 Mar 2019 00:30:21 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Mar 2019 00:30:21 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id F305382F24; Tue, 19 Mar 2019 00:30:20 +0000 (UTC) Date: Tue, 19 Mar 2019 00:30:20 +0000 To: "cvs@incubator.apache.org" Subject: [incubator] branch master updated: Build with new clutch process and pages MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155295542094.26363.13034177441028072126@gitbox.apache.org> From: wave@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ef447b055dd44db68e5447706a7b78c587658024 X-Git-Newrev: 7a95a7d6da8d03793a8fe04c89e2c37f41882554 X-Git-Rev: 7a95a7d6da8d03793a8fe04c89e2c37f41882554 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. wave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator.git The following commit(s) were added to refs/heads/master by this push: new 7a95a7d Build with new clutch process and pages 7a95a7d is described below commit 7a95a7d6da8d03793a8fe04c89e2c37f41882554 Author: Dave Fisher AuthorDate: Mon Mar 18 17:30:17 2019 -0700 Build with new clutch process and pages Build is reordered and uses a new clutch process. Site is baked after the SVN, Anakia, and Clutch2 are run. If clutch2 fails then the process should abort --- build_site.sh | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/build_site.sh b/build_site.sh index f1177c7..21449a3 100755 --- a/build_site.sh +++ b/build_site.sh @@ -1,5 +1,6 @@ #!/bin/bash +CURRENTDIR=`pwd` WORKDIR=/tmp/incubator-site SVN_CO_DIR=/tmp/incubator-site-content SVN_BUILD_DIR=/tmp/incubator-site-build @@ -8,7 +9,9 @@ SVN_REPO=http://svn.apache.org/repos/asf/incubator/public/trunk/ # build the git bits rm -rf $WORKDIR mkdir -p $WORKDIR -./bake.sh -b . $WORKDIR +mkdir -p $WORKDIR/clutch + +echo $CURRENTDIR # build the svn bits rm -rf $SVN_CO_DIR @@ -17,12 +20,25 @@ svn co $SVN_REPO $SVN_CO_DIR ( cd $SVN_CO_DIR ant docs -Ddocs.dest=$SVN_BUILD_DIR - python3 clutch.py + # these files were built using ant in the old style mv $SVN_BUILD_DIR/ip-clearance $WORKDIR mv $SVN_BUILD_DIR/projects $WORKDIR - mv $SVN_BUILD_DIR/clutch $WORKDIR + # new clutch2 process + ./clutch2.sh + if [ $? -gt 0 ]; then + echo clutch2.sh returned $? - ABORT + exit 4 + fi + # these txt files are moved to output + cp $SVN_CO_DIR/content/clutch/*.txt $WORKDIR/clutch/. + # the following files go to be baked + cp $SVN_CO_DIR/content/clutch/_includes/*.ad $CURRENTDIR/pages/clutch/_includes/. + cp $SVN_CO_DIR/content/clutch/*.ad $CURRENTDIR/pages/clutch/. ) +# now bake the site +./bake.sh -b . $WORKDIR + # push all of the results to asf-site git checkout asf-site git clean -f -d --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org For additional commands, e-mail: cvs-help@incubator.apache.org