X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=2f93abd9e4b720177c3e590a5b5f422a53c93ef4;hb=0a66c777fc991c8a959ac3b054f1eb32a9e9115a;hp=08c902ca90f65f8044dfe74e1cbf3cd79fbabb81;hpb=bfdab051f22d11a553b69f28a294cb012b0b6c50;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 08c902ca..2f93abd9 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -3,8 +3,8 @@
 set -e
 
 bspdir="$PWD/data"
-url_http=http://beta.xonotic.org/autobuild-bsp/
-url_ssh=xonotic-beta:autobuild-bsp/
+url_http=https://beta.xonotic.org/autobuild-bsp/
+url_ssh=xonotic-beta:.
 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.8"
@@ -164,7 +164,8 @@ buildthemap()
 	blobhash=$4
 	commithash=$5
 	if lwp-request -m HEAD "$url$M-$blobhash.pk3"; then
-		continue
+		# already compiled
+		return
 	fi
 
 	git reset --hard
@@ -184,36 +185,21 @@ buildthemap()
 		is_nosrgb=false
 	fi
 	allow_build=true
-	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
+		case "$REFNAME" in
+			master|refs/heads/master|origin/master|refs/remotes/origin/master)
 				if [ -n "$IRCSPAM" ]; then
-					echo "8NOTE: map $M still uses -nosRGB. This should eventually get fixed." | $IRCSPAM || true
+					echo "4ERROR: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
 				fi
-			else
+				allow_build=false
+				;;
+			*)
 				if [ -n "$IRCSPAM" ]; then
-					echo "9CONGRATULATIONS: 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
+					echo "4WARNING: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
 				fi
-			fi
-			;;
-		*)
-			if $is_nosrgb; then
-				case "$REFNAME" in
-					master|refs/heads/master|origin/master|refs/remotes/origin/master)
-						if [ -n "$IRCSPAM" ]; then
-							echo "4ERROR: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
-						fi
-						allow_build=false
-						;;
-					*)
-						if [ -n "$IRCSPAM" ]; then
-							echo "4WARNING: map $M uses -nosRGB. This is not acceptable in master. Please fix." | $IRCSPAM || true
-						fi
-						;;
-				esac
-			fi
-			;;
-	esac
+				;;
+		esac
+	fi
 
 	set +e
 	$allow_build && (
@@ -252,13 +238,19 @@ screenshotthemap()
 	M=$3
 	blobhash=$4
 	commithash=$5
+	if ! [ -f "$bspdir/$M-$blobhash.pk3" ]; then
+		# not downloaded yet
+		return
+	fi
+
 	if lwp-request -m HEAD "$url$M-$blobhash/$M-000000.jpg"; then
-		continue
+		# already done
+		return
 	fi
 
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp"; then
 		# no BSP file
-		continue
+		return
 	fi
 
 	rm -rf ~/.xonotic/data
@@ -316,17 +308,15 @@ getthemap()
 		fi
 	fi
 	if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
-		if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
+		if ! curl -Lo "$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"
-			getthemap_fail=true
 			return 0
 		fi
 	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"
-		getthemap_fail=true
 		return 0
 	fi
 }
@@ -391,13 +381,17 @@ case "$1" in
 			git clean -xfd
 			git checkout -f "$HASH"
 
+			getthemap_fail=false
 			rundownload
+
+			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
+
 			if $getthemap_fail; then
+				# If any map fetch failed, we've skipped them and thus need to try again later.
+				# Note that we're not going to re-screenshot maps because of this as we'll check for uploaded screenshots first.
 				continue
 			fi
 
-			allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
-
 			touch "$screenshot_cachedir/$HASH"
 		done
 		git checkout -f master