X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=90a012325b829c864083833b20f87292821e07db;hp=2e6b180d79054d0fdfbd3bfcb148af1b1bc4065f;hb=600285e93c924f3bfc482dee2c4990768c05cd79;hpb=f02e62217d1df88bc914c38073eb366f939e29c8 diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index 2e6b180d..90a01232 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -4,7 +4,7 @@ set -e bspdir="$PWD/data" url=http://beta.xonotic.org/autobuild-bsp/ -url_ssh=beta.xonotic.org:autobuild-bsp/ +url_ssh=xonotic-beta:autobuild-bsp/ cachedir="$HOME/xonotic-map-compiler.cache/" override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900" @@ -137,8 +137,11 @@ buildthemap() fi zip -9r "$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" "$M.pk3" # from ALL branches, so beware! - rsync -vaSHP "$M-$blobhash.pk3" "$url_ssh" - rsync -vaSHP "$M.pk3" "$url_ssh""latest/" + cp "$M-$blobhash.pk3" "$M-full-$blobhash.pk3" + zip -9r "$M-full-$blobhash.pk3" `git diff --name-only --diff-filter=ACMRTUXB master...HEAD` || true + ln -snf "../$M-full-$blobhash.pk3" "$M-full.pk3" # from ALL branches, so beware! + rsync -vaSHP "$M-$blobhash.pk3" "$M-full-$blobhash.pk3" "$url_ssh" + rsync -vaSHP "$M.pk3" "$M-full.pk3" "$url_ssh""latest/" if [ -n "$IRCSPAM" ]; then $IRCSPAM < "maps/$M.irc" fi