Allow the repo's default branch to differ from master.

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler-autobuild

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index e168dc23e93733cef012a1233902aaa4bce72b06..08c902ca90f65f8044dfe74e1cbf3cd79fbabb81 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -7,7 +7,7 @@ url_http=http://beta.xonotic.org/autobuild-bsp/
 url_ssh=xonotic-beta:autobuild-bsp/
 build_cachedir="$HOME/xonotic-map-compiler.cache/"
 screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
-build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 18000 -minimap_timeout 900 -scale_timeout 900 -timeout_stealing 0.75"
+build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 18000 -minimap_timeout 900 -scale_timeout 900 -timeout_stealing 0.8"
 screenshot_override="9 900 5 +g_ctf 1"
 
 getthemap_fail=false
@@ -184,11 +184,15 @@ buildthemap()
                is_nosrgb=false
        fi
        allow_build=true
-       case "$map" in
+       case "$M" in
                afterslime|dance|drain|glowplant|leave_em_behind|newtonian-nightmare|nexballarena|oilrig|red-planet|runningmanctf|runningman|space-elevator|stormkeep|techassault|xoylent)
-                       if ! $is_nosrgb; then
+                       if $is_nosrgb; then
+                               if [ -n "$IRCSPAM" ]; then
+                                       echo "\ 38NOTE:\ f map $M still uses -nosRGB. This should eventually get fixed." | $IRCSPAM || true
+                               fi
+                       else
                                if [ -n "$IRCSPAM" ]; then
-                                       echo "CONGRATULATIONS: map $map does not use -nosRGB any more. Please remove the map name from the list in xonotic-map-compiler-autobuild once this is merged to master." | $IRCSPAM || true
+                                       echo "\ 39CONGRATULATIONS: map $M does not use -nosRGB any more. Please remove the map name from the list in xonotic-map-compiler-autobuild once this is merged to master." | $IRCSPAM || true
                                fi
                        fi
                        ;;
@@ -197,13 +201,13 @@ buildthemap()
                                case "$REFNAME" in
                                        master|refs/heads/master|origin/master|refs/remotes/origin/master)
                                                if [ -n "$IRCSPAM" ]; then
-                                                       echo "\ 34ERROR: map $map uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
+                                                       echo "\ 34ERROR: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
                                                fi
                                                allow_build=false
                                                ;;
                                        *)
                                                if [ -n "$IRCSPAM" ]; then
-                                                       echo "\ 34WARNING:\ f map $map uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
+                                                       echo "\ 34WARNING:\ f map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
                                                fi
                                                ;;
                                esac
@@ -288,6 +292,9 @@ screenshotthemap()
        rsync -vaSHP "$M-$blobhash" "$url_ssh"
        rsync -vaSHP "$M" "$url_ssh""latest/"
        if [ -n "$IRCSPAM" ]; then
+               # It takes about 5 minutes for the server to update.
+               sleep 360  # Cut it one more minute of slack.
+
                $IRCSPAM < "$M-$blobhash/$M.ircss" || true
        fi
        if [ -n "$BUILD_ONE" ]; then