X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=672489ff3de62e899d1317c1ef9afbe3ca83c2b3;hp=d0ef82e22b1409d0a57fac3a16290ecfcdc8f557;hb=c0386f2fba6cd039ef865295b97beaa1f94b3ff9;hpb=f1c468e0b25928672e07e6c4ade8ee12a791350d diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index d0ef82e2..672489ff 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -4,6 +4,7 @@ set -e bspdir="$PWD/data" url=http://141.2.16.23/~xonotic/bsp-autobuilds/ +override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900" bspoutdir="$HOME/public_html/bsp-autobuilds/" @@ -23,20 +24,123 @@ allmaps() done } +pre2spam() +{ + map=$1 + url=$2 + branch=$3 + hash=$4 + + branch=${branch##refs/heads/} + branch=${branch##refs/remotes/} + branch=${branch##origin/} + hash=`echo "$hash" | cut -c 1-7` + + echo "[$branch $hash] starting map compile of $map" +} + +log2spam() +{ + map=$1 + url=$2 + branch=$3 + hash=$4 + status=$5 + time=$6 + + hash=`echo "$hash" | cut -c 1-7` + + branch=${branch##refs/heads/} + branch=${branch##refs/remotes/} + branch=${branch##origin/} + + s_samplesize= + s_failshaders= + s_leaked= + s_error= + + if [ "$status" -ne 0 ]; then + s_error="exited with status $status" + fi + while IFS= read -r L; do + case "$L" in + WARNING:\ surface\ at\ *\ too\ large\ for\ desired\ samplesize*) + s=${L##* } + if [ -z "$s_samplesize" ] || [ "$s" -gt "$s_samplesize" ]; then + s_samplesize=$s + fi + ;; + WARNING:\ Couldn\'t\ find\ image\ for\ shader\ textures/NULL) + # radiant stupid + ;; + WARNING:\ Couldn\'t\ find\ image\ for\ shader\ *) + s_failshaders="$s_failshaders ${L##* }" + ;; + '******* leaked *******') + s_leaked=1 + ;; + '************ ERROR ************') + IFS= read -r s_error + ;; + esac + done + s_failshaders=`echo "$s_failshaders" | sed "s, textures/, ,g"` + s_failshaders=${s_failshaders# } + if [ -n "$s_error" ]; then + echo -n "[$branch $hash] 4failed" + else + echo -n "[$branch $hash] finished" + fi + echo -n " map compile of $map ($url): $time sec" + if [ -n "$s_samplesize" ]; then + echo -n ", FIX samplesize >= $s_samplesize" + fi + if [ -n "$s_failshaders" ]; then + if [ -n "`echo "$s_failshaders" | cut -d ' ' -f 4-`" ]; then + s_failshaders="`echo "$s_failshaders" | cut -d ' ' -f 1-3`..." + fi + echo -n ", FIX shaders $s_failshaders" + fi + if [ -n "$s_leaked" ]; then + echo -n ", FIX LEAK" + fi + if [ -n "$s_error" ]; then + s_error=`echo "$s_error" | sed "s,$PWD/\?,,g"` + echo -n ", ERROR: $s_error" + fi + echo +} + buildthemap() { - bspdir=$1 - M=$2 - blobhash=$3 + REFNAME=$1 + HASH=$2 + url=$3 + bspdir=$4 + M=$5 + blobhash=$6 if [ -f "$bspdir/$M-$blobhash.pk3" ]; then continue fi + if [ -n "$IRCSPAM" ]; then + pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM + fi + t0=`date +$s` ( cd maps - ../../../misc/tools/xonotic-map-compiler "$M" `head -n 1 "$M.map.options"` 2>&1 | tee "$M.log" + ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $override > "$M.log" ) - zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga" + t1=`date +$s` + dt=$(($t1 - $t0)) + status=$? + if [ -n "$IRCSPAM" ]; then + cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc" + fi + zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga" ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware! + if [ -n "$IRCSPAM" ]; then + $IRCSPAM < "maps/$M.irc" + fi } getthemap() @@ -52,12 +156,12 @@ getthemap() if ! wget -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then rm -f "$bspdir/$M-$blobhash.pk3" echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet" - return 1 + return 0 fi if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then rm -f "$bspdir/$M-$blobhash.pk3" echo "WARNING: could not download $url$M-$blobhash.pk3, invalid zip file" - return 1 + return 0 fi } @@ -70,12 +174,11 @@ case "$1" in git reset --hard git clean -xfd git checkout "$HASH" - allmaps buildthemap "$bspoutdir" + allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir" done git checkout master ;; download) - rm -rf "$bspdir.old" mkdir -p "$bspdir" "$bspdir.old" mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true cd data/xonotic-maps.pk3dir @@ -87,6 +190,9 @@ case "$1" in mkdir -p "$bspdir" cd "$bspdir" rm -f *-????????????????????????????????????????-????????????????????????????????????????.pk3 - wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url/latest" + wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url""latest" + ;; + log2spam-test) + log2spam "mapname" "http://mapurl" "branch" "commit" "0" ;; esac