From: Mario <mario@smbclan.net>
Date: Sun, 24 May 2020 17:51:49 +0000 (+1000)
Subject: Disable feature branches in the release script, since they no longer exist
X-Git-Tag: xonotic-v0.8.5~91
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=c77e16972166ff132139ddfa92c0a66cd8d95343

Disable feature branches in the release script, since they no longer exist
---

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 24f7d4fc..5bed45e6 100755
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -39,13 +39,15 @@ cd ~/xonotic-release-build
 # map branches that we include:
 #   winners in the poll for upcoming CTF maps
 #   maps near completion
+# uncomment below when a branch is needed
+# the listed branches are examples only
 
-for b in \
-	origin/fruitiex/runningmanctf \
-	origin/mintox/geoplanetary
-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/fruitiex/runningmanctf \
+#	origin/mintox/geoplanetary
+#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