From continuum-commits-return-717-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Wed Aug 03 10:55:58 2005 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 88686 invoked from network); 3 Aug 2005 10:55:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Aug 2005 10:55:58 -0000 Received: (qmail 65850 invoked by uid 500); 3 Aug 2005 10:55:57 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 65829 invoked by uid 500); 3 Aug 2005 10:55:57 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 65813 invoked by uid 99); 3 Aug 2005 10:55:57 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 Aug 2005 03:55:46 -0700 Received: (qmail 88668 invoked by uid 65534); 3 Aug 2005 10:55:44 -0000 Message-ID: <20050803105544.88667.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r227195 - /maven/continuum/trunk/ci_continuum.sh Date: Wed, 03 Aug 2005 10:55:44 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Wed Aug 3 03:55:37 2005 New Revision: 227195 URL: http://svn.apache.org/viewcvs?rev=227195&view=rev Log: Build m2 trunk too to verify continuum work with it Modified: maven/continuum/trunk/ci_continuum.sh Modified: maven/continuum/trunk/ci_continuum.sh URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/ci_continuum.sh?rev=227195&r1=227194&r2=227195&view=diff ============================================================================== --- maven/continuum/trunk/ci_continuum.sh (original) +++ maven/continuum/trunk/ci_continuum.sh Wed Aug 3 03:55:37 2005 @@ -29,7 +29,8 @@ fi HOME_DIR=`pwd` -DIR=$HOME/continuum-build +DIR=$HOME_DIR/checkouts +SUNREPO=$HOME_DIR/sunrepo REPO=$HOME_DIR/maven-repo-local SCM_LOG=scm.log TIMESTAMP=`date +%Y%m%d.%H%M%S` @@ -58,11 +59,6 @@ # ---------------------------------------------------------------------------------- -BUILD_REQUIRED=false -if [ -f $HOME_DIR/build_required ]; then - BUILD_REQUIRED=`cat $HOME_DIR/build_required` -fi - if [ ! -d $DIR/maven-components ]; then CMD="checkout" fi @@ -72,33 +68,47 @@ then rm -rf $DIR > /dev/null 2>&1 - + mkdir $DIR - + rm -rf $REPO > /dev/null 2>&1 - + mkdir $REPO + cp -R $SUNREPO/* $REPO/ + + echo + echo "Performing a clean check out of maven2 ..." + echo + + ( + cd $DIR + + $SVN co http://svn.apache.org/repos/asf/maven/components/trunk maven-components > $HOME_DIR/$SCM_LOG 2>&1 + + build_m1=1 + ) + echo echo "Performing a clean check out of continuum ..." echo ( cd $DIR - + $SVN co http://svn.apache.org/repos/asf/maven/continuum/trunk continuum > $HOME_DIR/$SCM_LOG 2>&1 - - echo "true" > $HOME_DIR/build_required + + build_continuum=1 ) - + else - + echo - echo "Performing an update of continuum ..." + echo "Performing an update of maven-components ..." echo - + ( - cd $DIR/continuum + cd $DIR/maven-components $SVN update > $HOME_DIR/$SCM_LOG 2>&1 @@ -106,53 +116,69 @@ if [ "$?" = "1" ] then - - echo $BUILD_REQUIRED > $HOME_DIR/build_required - - else - - echo "true" > $HOME_DIR/build_required - + build_m2=0 + else + build_m1=1 + fi + + ) + + echo + echo "Performing an update of continuum ..." + echo + + ( + cd $DIR/continuum + + $SVN update > $HOME_DIR/$SCM_LOG 2>&1 + + grep "^[PUAD] " $HOME_DIR/$SCM_LOG > /dev/null 2>&1 + + if [ "$?" = "1" ] + then + build_continuum=0 + else + build_continuum=1 fi ) fi - - BUILD_REQUIRED=`cat $HOME_DIR/build_required` - if [ "$BUILD_REQUIRED" = "true" ] + if [ build_m2 != 0 -o build_continuum != 0 ] then echo "Updates occured, build required ..." echo - grep "^[PUAD] " $HOME_DIR/$SCM_LOG - echo ( - cd $DIR/continuum + cd $DIR/maven-components + sh m2-bootstrap-all.sh -Dmaven.repo.local="$REPO" -Dmaven.home="$M2_HOME" --update-snapshots + ret=$?; if [ $ret != 0 ]; then exit $ret; fi + ) + ret=$?; if [ $ret != 0 ]; then exit $ret; fi + + ( + cd $DIR/continuum + sh build.sh -Dmaven.repo.local="$REPO" -Dmaven.home="$M2_HOME" ret=$?; if [ $ret != 0 ]; then exit $ret; fi ) ret=$?; if [ $ret != 0 ]; then exit $ret; fi else - echo "No updates occured, no build required. Done." - fi ) >> $MESSAGE 2>&1 ret=$? -BUILD_REQUIRED=`cat $HOME_DIR/build_required` - # Only send mail to the list if a build was required. host=`hostname` -if [ "$BUILD_REQUIRED" = "true" ] +if [ build_m2 != 0 -o build_continuum != 0 ] then echo "From: $FROM" > log echo "To: $TO" >> log @@ -160,7 +186,6 @@ echo "Subject: [continuum build - FAILED - $CMD] $DATE" >> log else echo "Subject: [continuum build - SUCCESS - $CMD] $DATE" >> log - rm $HOME_DIR/build_required fi echo "" >> log echo "Log:" >> log