empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch nightlybuilds to git

Browse source 
Create a local git repository on the SuSE nightly build machine.
Update local git repository from the Markus's public repository
at the beginnning of the nightlybuilds for SuSE and WIN32.
For the SuSE and WIN32 nightlybuilds drawn from the local
git repository on SuSE machine.
This commit is contained in:
Ron Koenderink 2008-02-04 20:26:46 -06:00
parent 77e95bd788
commit 70c03561bb
4 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/scripts/nightly/conf/suse.i386.config
View file

@ -4,5 +4,5 @@ LOGDIR=logs
INSTANCE=suse.i386 INSTANCE=suse.i386
EMPPORT=8889 EMPPORT=8889
NIGHTLY_SKIP_STEP= NIGHTLY_SKIP_STEP=
export CVS_RSH=ssh GITROOT=/home/empire/empserver.git
export CVSROOT=:ext:koenderink@empserver.cvs.sourceforge.net/cvsroot/empserver export LANG=C

4
src/scripts/nightly/conf/win32.i386.config
View file

@ -4,6 +4,6 @@ LOGDIR=logs
INSTANCE=win32.i386 INSTANCE=win32.i386
EMPPORT=8889 EMPPORT=8889
NIGHTLY_SKIP_STEP= NIGHTLY_SKIP_STEP=
export CVS_RSH=ssh GITROOT=ssh://ron-VM2/~empire/empserver.git
export CVSROOT=:ext:koenderink@empserver.cvs.sourceforge.net:/cvsroot/empserver PATH=$PATH:/c/Progra~1/git/bin

2
src/scripts/nightly/cron/cron.suse.i386
View file

@ -1,4 +1,6 @@
#!/bin/sh #!/bin/sh
cd /home/empire/empserver.git
git pull 2>&1 >/dev/null
cd /home/empire cd /home/empire
./nightlybuild.sh suse.i386.config ./nightlybuild.sh suse.i386.config
./report.sh suse.i386.config | mutt -s 'empserver suse.i386' empserver-devel@lists.sourceforge.net ./report.sh suse.i386.config | mutt -s 'empserver suse.i386' empserver-devel@lists.sourceforge.net

45
src/scripts/nightly/nightlybuild.sh
View file

@ -91,23 +91,39 @@ in
*) *)
# Make sandbox # Make sandbox
mkdir "${WORKDIR}" || warn "Could not create ${BOXDIR}/${WORKDIR}" if [ -d "${WORKDIR}" ]
then
! [ -d "${WORKDIR}"/empserver/.git ] || err "Invalid sandbox, missing .git directory"
else
echo making directory
mkdir "${WORKDIR}" || warn "Could not create ${BOXDIR}/${WORKDIR}"
fi
cd "${WORKDIR}" || err "Could not cd to ${BOXDIR}/${WORKDIR}" cd "${WORKDIR}" || err "Could not cd to ${BOXDIR}/${WORKDIR}"
echo "Getting source from CVS:" echo "Getting source from GIT:"
# Extract source # Extract source
export CVS_RSH=${CVS_RSH:=ssh} export GITROOT=${GITROOT:= git://git.pond.sub.org/~armbru/empserver}
export CVSROOT=${CVSROOT:=:pserver:anonymous@empserver.cvs.sourceforge.net:/cvsroot/empserver}
RETR=0 RETR=0
while ! cvs -z3 co empserver >/dev/null if ! [ -d empserver ]
do then
while ! git clone $GITROOT empserver >/dev/null
do
sleep "`expr 5 + ${RETR}`" sleep "`expr 5 + ${RETR}`"
RETR="`expr 1 + ${RETR}`" RETR="`expr 1 + ${RETR}`"
[ "${RETR}" -gt 5 ] && err "CVS Timeout after ${RETR} retres." [ "${RETR}" -gt 5 ] && err "git-clone Timeout after ${RETR} retres."
done
else
while ! git pull $GITROOT master >/dev/null
do
sleep "`expr 5 + ${RETR}`"
RETR="`expr 1 + ${RETR}`"
[ "${RETR}" -gt 5 ] && err "GIT pull Timeout after ${RETR} retres."
done done
echo "Done (CVS)."
echo ""
fi
echo "Done (GIT)."
echo ""
;; ;;
esac esac
# #
@ -156,7 +172,7 @@ fi
cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver." cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver."
cvs up -d git-pull
sh ./bootstrap sh ./bootstrap
./configure --prefix ${BOXDIR}/${WORKDIR}/emp4 ./configure --prefix ${BOXDIR}/${WORKDIR}/emp4
@ -523,11 +539,18 @@ in
echo "Cleaning sandbox" echo "Cleaning sandbox"
cd "${BOXDIR}" || err "Could not cd back to sandbox root !" cd "${BOXDIR}" || err "Could not cd back to sandbox root !"
case "${NIGHTLY_SKIP_STEP}"
in
*REMOVE_REPOSITORY*)
rm -rf `find "${WORKDIR}" -maxdepth 1 ! -name .git` || warn "Directory ${WORKDIR} could not be forcibly removed !"
;;
*)
rm -r "${WORKDIR}" || warn "Directory ${WORKDIR} could not be cleanly removed !" rm -r "${WORKDIR}" || warn "Directory ${WORKDIR} could not be cleanly removed !"
rm -rf "${WORKDIR}" || warn "Directory ${WORKDIR} could not be forcibly removed !" rm -rf "${WORKDIR}" || warn "Directory ${WORKDIR} could not be forcibly removed !"
[ -d "${WORKDIR}/." ] && warn "Directory ${WORKDIR} still present" [ -d "${WORKDIR}/." ] && warn "Directory ${WORKDIR} still present"
echo "Done (cleaning)." echo "Done (cleaning)."
;;
esac
;; ;;
esac esac
# #