gmqcc: the usual branch now is main.

[xonotic/xonotic.git] / misc / infrastructure / xonotic-release-build.cron

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 024887895d230511c605caa05a09b902d33b2fc7..5bed45e6ff5f6e8ca4b34e72850f865bd30462fc 100755 (executable)
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -39,15 +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/space_elevator \
-       origin/fruitiex/dance \
-       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
@@ -61,5 +61,6 @@ for X in Xonotic-$d*.zip; do
        ln -snf "$X" "Xonotic-latest${X#Xonotic-$d}"
 done
 rsync -vaSHP Xonotic*.zip xonotic-beta:autobuild/
+ssh xonotic-beta sh update-rsync.sh "$d"
 echo "Finished a new beta build at http://beta.xonotic.org/autobuild/" | $IRCSPAM
 cd