[Fusionforge-commits] FusionForge branch master updated. d9841081cf51e25355d5bc8f272731bae5cd441f

Roland Mas lolando at fusionforge.org
Fri Nov 23 17:38:46 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  d9841081cf51e25355d5bc8f272731bae5cd441f (commit)
      from  d2f47a62d05af379e54a3cd1937d362ae9c943a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d9841081cf51e25355d5bc8f272731bae5cd441f
Author: Roland Mas <lolando at debian.org>
Date:   Fri Nov 23 17:38:19 2012 +0100

    No point in starting the VM until after we know the packages can be built

diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 44faddf..0579d2c 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -14,10 +14,6 @@ export FILTER="DEBDebian70Tests.php"
 #export FILTER="func/PluginsMoinMoin/moinmoinTest.php"
 
 prepare_workspace
-destroy_vm -t debian7 $HOST
-start_vm_if_not_keeped -t debian7 $HOST
-
-setup_debian_3rdparty_repo
 
 CHECKOUTPATH=$(pwd)
 
@@ -51,13 +47,6 @@ dch -b -v $MAJOR$MINOR -D UNRELEASED "This is $DIST-$ARCH autobuild"
 sed -i -e "1s/UNRELEASED/$DIST/" debian/changelog
 pdebuild --configfile $COWBUILDERCONFIG --buildresult $BUILDRESULT
 
-#[ ! -f debian/changelog.sos ] || mv debian/changelog.sos debian/changelog
-#cp debian/changelog debian/changelog.sos
-#dch -b -v $MAJOR$MINOR -D UNRELEASED "This is $DIST-$ARCH autobuild"
-#sed -i -e "1s/UNRELEASED/$DIST/" debian/changelog
-#pdebuild --configfile $COWBUILDERCONFIG --buildresult $BUILDRESULT
-#[ ! -f debian/changelog.sos ] || mv debian/changelog.sos debian/changelog
-
 cd $BUILDRESULT
 REPOPATH=$WORKSPACE/build/debian
 
@@ -78,8 +67,10 @@ EOF
 
 reprepro -Vb $REPOPATH include $DIST $CHANGEFILE
 
-# Build fusionforge
-# make -f Makefile.debian BUILDRESULT=$WORKSPACE/build/packages LOCALREPODEB=$WORKSPACE/build/debian rwheezy
+destroy_vm -t debian7 $HOST
+start_vm_if_not_keeped -t debian7 $HOST
+
+setup_debian_3rdparty_repo
 
 cd $CHECKOUTPATH
 # Transfer preseeding

-----------------------------------------------------------------------

Summary of changes:
 tests/scripts/fusionforge-build-and-test-deb.sh |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list