Only build if we haven't built before. Trying to reduce bandwidth usage.

Webconverger · Jun 13, 2013 · 73d8431 · 73d8431
1 parent f0cd2fa
commit 73d8431
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.txt
+*.iso
diff --git a/.htaccess b/.htaccess
@@ -0,0 +1,3 @@
+Redirect /latest.iso /webc-4b74283.iso 
+Redirect /latest.txt /webc-4b74283.txt 
+IndexIgnore webc-build.sh
diff --git a/HEADER.html → README.html b/HEADER.html → README.html
@@ -6,7 +6,7 @@
 </style>
 </head>
 <body>
-<h1>Webconverger daily builds for bug hunters</h1>
+<h1>Webconverger daily builds</h1>
 
 <p>Scared? Please see the <a
 href="http://download.webconverger.com/">Webconverger download site</a> for
@@ -28,5 +28,14 @@ <h1>Webconverger daily builds for bug hunters</h1>
 
 <p><a href="https://github.com/Webconverger/dailybuild">Source code on github of this build tool</a></p>
 
+<h3>Cronjob</h3>
+
+<p>As root:</p>
+
+<pre>
+@daily /srv/www/build.webconverger.org/webc-build.sh
+@daily find /srv/www/build.webconverger.org/ -mindepth 1 -maxdepth 1 -mtime +4 \( -name "*.txt" -o -name "*.iso" \) -exec rm -vrf {} \;
+</pre>
+
 </body>
 </html>
diff --git a/deliver.sh b/deliver.sh
diff --git a/webc-build.sh b/webc-build.sh
@@ -1,7 +1,15 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
-OUTPUT="/srv/www/build.webconverger.org/output"
-#DEBUG=true
+OUTPUT="/srv/www/build.webconverger.org"
+
+sha=$(git ls-remote git://github.com/Webconverger/webc.git refs/heads/master)
+shortsha=${sha:0:7}
+
+if ls $OUTPUT/webc-$shortsha.*
+then
+	echo Already built!
+	exit
+fi
 
 BUILDID=webconverger.$(date --rfc-3339=date)
 
@@ -34,7 +42,7 @@ test "$DEBUG" && echo TEMPDIR $TEMPDIR
 mailerror () {
 echo BUILD FAILED at $BUILDID
 echo "$LOG" |
-mail -a 'From: hendry@webconverger.com' -s "failed" kai.hendry@gmail.com
+mail -a 'From: hendry@webconverger.com' -s "uk failed" kai.hendry@gmail.com
 exit 1
 }
 
@@ -66,6 +74,6 @@ cd Debian-Live-config/webconverger
 git describe --always
 
 # http://webconverger.org/upgrade/
-make deploy
+make deploy OUTPUT=$OUTPUT
 
 chown -R www-data:www-data $OUTPUT