From: Rudolf Polzer <divVerent@gmail.com>
Date: Fri, 12 Nov 2021 20:54:45 +0000 (-0800)
Subject: selfbuildagain branch is merged, no longer need to merge in the build script.
X-Git-Tag: xonotic-v0.8.5~56
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=b38e0d693faa41b52c428d3ad166927746c3ce0a;p=xonotic%2Fxonotic.git

selfbuildagain branch is merged, no longer need to merge in the build script.
---

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 4390a63c..d5219460 100755
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -68,11 +68,11 @@ cd ~/xonotic-release-build
 #   winners in the poll for upcoming CTF maps
 #   maps near completion
 
-for b in \
-	origin/divVerent/selfbuildagain \
-; do
-	b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
-done
+#for b in \
+#	origin/divVerent/selfbuildagain \
+#; do
+#	b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
+#done
 ./all update -N
 d0=`date +%Y%m%d`
 d=$d0