Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix preview script so it can checkout and build from tags

This commit is contained in:
Enno Rehling 2015-02-01 08:21:07 +01:00
parent 5e0c934c6f
commit 6b1285a784
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
s/cron/previews.sh
View File

@ -1,11 +1,18 @@
#!/bin/sh #!/bin/sh
function abort() {
echo $1
[ -z $2 ] && exit -1
exit $2 # otherwise
}
[ -z ${ERESSEA} ] && ERESSEA=~/eressea [ -z ${ERESSEA} ] && ERESSEA=~/eressea
branch="master" branch="master"
if [ -e ${ERESSEA}/build/.preview ]; then if [ -e ${ERESSEA}/build/.preview ]; then
branch=`cat ${ERESSEA}/build/.preview` branch=`cat ${ERESSEA}/build/.preview`
fi fi
SRC=${ERESSEA}/git SRC=${ERESSEA}/git
${SRC}/s/preview build ${branch} ${SRC}/s/preview build ${branch} || abort "failed to build ${branch}"
${SRC}/s/preview version ${SRC}/s/preview version
for game in 2 3 4 ; do for game in 2 3 4 ; do
${SRC}/s/preview -g ${game} run && \ ${SRC}/s/preview -g ${game} run && \

3
s/preview
View File

@ -22,8 +22,9 @@ exit $2 # otherwise
function build() { function build() {
assert_dir $SOURCE assert_dir $SOURCE
cd $SOURCE cd $SOURCE
git fetch || abort "failed to update source. do you have local changes?"
[ -z $1 ] || git checkout $1 [ -z $1 ] || git checkout $1
( git pull && git submodule update ) || abort "failed to update source. do you have local changes?" git submodule update
s/build || abort "build failed." s/build || abort "build failed."
} }