gh-pages fix?

mozilla · Mar 1, 2012 · b46dd49 · b46dd49
1 parent 71e9fd1
commit b46dd49
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/run-web b/run-web
@@ -4,14 +4,14 @@
 #
 
 if [ $# -ne 1 ]; then
-  echo 'arguments: <main_repo_url>'
+  echo 'arguments: <main_repo_url> <tmp_dir>'
   echo
   exit
 fi
 MAIN_URL=$1
 # DO NOT USE LOCAL TMP_DIR=./tmp ... 
 # otherwise 'git push' below will push to bot repo too
-TMP_DIR=/tmp
+TMP_DIR=$2
 
 #
 # Pull main repo

diff --git a/server.js b/server.js
@@ -65,8 +65,10 @@ function setupServer(callback){
     var payload = JSON.parse(req.body.payload);
     console.log((new Date())+': received POST /newmerge');
 
-    if (payload.ref !== 'refs/heads/master')
-      return;      
+    if (payload.ref !== 'refs/heads/master') {
+      console.log((new Date())+': /newmerge not on master branch. skipping update of gh-pages');
+      return;
+    }
 
     queue.push(function(){      
       console.log((new Date())+': processing POST /newmerge');
@@ -77,7 +79,7 @@ function setupServer(callback){
           pull_url: '',
           pull_sha: '',
           ref_url: '',
-          tmp_path: '',
+          tmp_path: config.tmp_path,
           timeout: config.process_timeout_mins*60*1000,
         }, 
         function(output){