Disable feature branches in the release script, since they no longer exist
authorMario <mario@smbclan.net>
Sun, 24 May 2020 17:51:49 +0000 (03:51 +1000)
committerMario <mario@smbclan.net>
Sun, 24 May 2020 17:51:49 +0000 (03:51 +1000)
misc/infrastructure/xonotic-release-build.cron

index 24f7d4f..5bed45e 100755 (executable)
@@ -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