Update xonotic-release-build.cron

[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 5bd4aeae70c3a9fe57cf7657844427f78f4e4bae..5a5fd72c10f5afe75669cc16ae25c362de3648e8 100755 (executable)
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -26,6 +26,9 @@ export PATH=/home/xonotic-build/ccache:/home/xonotic-build/bin:/usr/local/bin:/u
 export CACHEDIR=$HOME/.xonotic-cached-converter-crunch
 export dds_tool=crunch
 
+# Build locally.
+export HOSTS_THAT_ARE_MYSELF='xonotic-build-linux64 xonotic-build-win32 xonotic-build-win64 xonotic-build-osx'
+
 mepwd=$PWD
 me=$0
 
@@ -36,10 +39,8 @@ fi
 
 set -ex
 
-# TODO re-enable this cleanup script
-: ssh autobuild-release-uploader@beta.xonotic.org '
+test "$RELEASETYPE" = "autobuild" && ssh autobuild-release-uploader@beta.xonotic.org '
        set -e;
-       cd HTML/autobuild/;
        s0=`date -d "now - 7 days - 12 hours" +%s`;
        s00=`date -d "now - 60 days - 12 hours" +%s`;
        for X in * */*; do
@@ -56,6 +57,7 @@ set -ex
                fi;
        done
 '
+
 cd ~/xonotic-release-build
 ./all clean --reclone
 # ./all checkout maint
@@ -67,11 +69,11 @@ cd ~/xonotic-release-build
 #   winners in the poll for upcoming CTF maps
 #   maps near completion
 
-## for b in \
-##     origin/divVerent/rebase/for-autobuild \
-## ; 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