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

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2017-02-26 20:23:25 +01:00
parent b8ffc20d87 b8d9fae4e4
commit 132ac0a38a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
s/preview
View File

@ -25,9 +25,9 @@ cd $SOURCE
rm -rf crypto tolua rm -rf crypto tolua
git fetch || abort "failed to update source. do you have local changes?" 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 pull -q
git submodule update git submodule update
s/build || abort "build failed." s/build > /dev/null || abort "build failed."
} }
function assert_file() { function assert_file() {
@ -79,7 +79,7 @@ SUPP="$SOURCE/share/debian-7_8.supp"
SERVER="$SOURCE/Debug/eressea/eressea" SERVER="$SOURCE/Debug/eressea/eressea"
VALGRIND=$(which valgrind) VALGRIND=$(which valgrind)
if [ ! -z $VALGRIND ]; then if [ ! -z $VALGRIND ]; then
SERVER="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER" SERVER="$VALGRIND --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"
fi fi
$SERVER -v$verbose -t$turn $SOURCE/scripts/run-turn.lua $SERVER -v$verbose -t$turn $SOURCE/scripts/run-turn.lua
let turn=$turn+1 let turn=$turn+1
@ -160,7 +160,7 @@ case "$1" in
done done
if [ $sent -eq 0 ]; then if [ $sent -eq 0 ]; then
if [ -e ../$factions ]; then if [ -e ../$factions ]; then
for faction in $(cat ../$factions) ; do for faction in $(grep -v -E '^#' ../$factions) ; do
send $faction send $faction
done done
fi fi

2
src/kernel/version.c
View File

@ -5,7 +5,7 @@
#ifndef ERESSEA_VERSION #ifndef ERESSEA_VERSION
/* the version number, if it was not passed to make with -D */ /* the version number, if it was not passed to make with -D */
#define ERESSEA_VERSION "3.11.0" #define ERESSEA_VERSION "3.12.0"
#endif #endif
const char *eressea_version(void) { const char *eressea_version(void) {