X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Finfrastructure%2Fxonotic-release-build.cron;h=5a5fd72c10f5afe75669cc16ae25c362de3648e8;hp=4390a63cd7d54293256bf437a7708de417c6a1c3;hb=78b3451cf2f330a1e0443ad07655683daf93e5bf;hpb=d38ad04459995da2adce44a8dabdf38a3dae9d2d

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 4390a63c..5a5fd72c 100755
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -27,7 +27,7 @@ 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'
+export HOSTS_THAT_ARE_MYSELF='xonotic-build-linux64 xonotic-build-win32 xonotic-build-win64 xonotic-build-osx'
 
 mepwd=$PWD
 me=$0
@@ -39,7 +39,7 @@ fi
 
 set -ex
 
-ssh autobuild-release-uploader@beta.xonotic.org '
+test "$RELEASETYPE" = "autobuild" && ssh autobuild-release-uploader@beta.xonotic.org '
 	set -e;
 	s0=`date -d "now - 7 days - 12 hours" +%s`;
 	s00=`date -d "now - 60 days - 12 hours" +%s`;
@@ -57,6 +57,7 @@ ssh autobuild-release-uploader@beta.xonotic.org '
 		fi;
 	done
 '
+
 cd ~/xonotic-release-build
 ./all clean --reclone
 # ./all checkout maint
@@ -68,11 +69,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