X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Finfrastructure%2Fxonotic-release-build.cron;h=f3c414a052e1befd7916e135068573bd87801f89;hp=75d814cb19d5eb5bebb3e5afac22c113150217fa;hb=16836605a62a8049620a71eaf64aeeb093973070;hpb=8201b1e8f6748faadd2beafb4b7af5219be1054e

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 75d814cb..f3c414a0 100755
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -22,6 +22,13 @@ export PATH=/home/xonotic-build/ccache:/home/xonotic-build/bin:/usr/local/bin:/u
 # TEST: use s2tc, high quality
 #export dds_tool=s2tc
 
+# Try crunch.
+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
 
@@ -32,9 +39,8 @@ fi
 
 set -ex
 
-ssh autobuild-release-uploader@beta.xonotic.org '
+test -z "$RELEASETYPEDIR" && 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
@@ -51,6 +57,7 @@ ssh autobuild-release-uploader@beta.xonotic.org '
 		fi;
 	done
 '
+
 cd ~/xonotic-release-build
 ./all clean --reclone
 # ./all checkout maint
@@ -62,26 +69,28 @@ 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
 i=1
-while HEAD http://xonotic:g-23@beta.xonotic.org/autobuild/"$RELEASETYPEDIR""Xonotic-$d.zip"; do
+while HEAD -C xonotic:g-23 http://beta.xonotic.org/autobuild/"$RELEASETYPEDIR""Xonotic-$d.zip"; do
 	i=$(($i+1))
 	d="$d0"_"$i"
 done
-RELEASEDATE=$d xvfb-run ./all release
+RELEASEDATE=$d ./all release
+sha512sum Xonotic-$d*.zip > Xonotic-$d.sha512
 for X in Xonotic-$d*.zip; do
 	ln -snf "$X" "Xonotic-latest${X#Xonotic-$d}"
 done
-rsync -vaSHP Xonotic*.zip autobuild-release-uploader@beta.xonotic.org:HTML/autobuild/"$RELEASETYPEDIR"
+ln -snf Xonotic-$d.sha512 Xonotic-latest.sha512
+rsync -vaSHP Xonotic*.zip Xonotic*.sha512 autobuild-release-uploader@beta.xonotic.org:"$RELEASETYPEDIR"
 if [ -z "$RELEASETYPEDIR" ]; then
-	ssh autobuild-release-uploader@beta.xonotic.org sh update-rsync.sh "$d"
+	ssh autobuild-release-uploader@beta.xonotic.org sh ../../update-rsync.sh "$d"
 fi
 echo "Finished a new $RELEASETYPENAME at http://beta.xonotic.org/autobuild/$RELEASETYPEDIR" | $IRCSPAM
 cd