Lint *after* merging upstream

mozilla · Nov 17, 2011 · 0b69429 · 0b69429
1 parent e487947
commit 0b69429
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/run-makeref b/run-makeref
@@ -93,35 +93,36 @@ if [ $? != 0 ]; then
 fi
 
 
+
 #
-# Run linter - MUST COME BEFORE OVERWRITING ANY FILES!
+# Merge upstream into pull request
 #
 echo
-echo "========== Running 'make lint'"
+echo "========== Merging upstream into pull request clone"
 cd $TARGET_DIR
-make lint &
-wait $!
+git pull --quiet $MAIN_URL master
 if [ $? != 0 ]; then
   echo
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "ERROR: Lint didn't pass."
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"  
+  echo "ERROR: Could not merge upstream into pull request. Please resolve conflicts."
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   exit
 fi
 
 
 #
-# Merge upstream into pull request
+# Run linter
 #
 echo
-echo "========== Merging upstream into pull request clone"
+echo "========== Running 'make lint'"
 cd $TARGET_DIR
-git pull --quiet $MAIN_URL master
+make lint &
+wait $!
 if [ $? != 0 ]; then
   echo
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "ERROR: Could not merge upstream into pull request. Please resolve conflicts."
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "ERROR: Lint didn't pass."
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"  
   exit
 fi
 

diff --git a/run-test b/run-test
@@ -92,16 +92,6 @@ if [ $? != 0 ]; then
 fi
 
 
-#
-# Run linter - MUST COME BEFORE OVERWRITING ANY FILES!
-#
-echo
-echo "========== Running 'make lint'"
-cd $TARGET_DIR
-make lint &
-wait $! # so we can trap SIGTERM, see above
-
-
 #
 # Merge upstream into pull request
 #
@@ -118,6 +108,16 @@ if [ $? != 0 ]; then
 fi
 
 
+#
+# Run linter
+#
+echo
+echo "========== Running 'make lint'"
+cd $TARGET_DIR
+make lint &
+wait $! # so we can trap SIGTERM, see above
+
+
 #
 # Pull reference snapshots
 #