From 405f372b66aa7512a7abe59d34950171584db42c Mon Sep 17 00:00:00 2001
From: Andrew Joslin <andytjoslin@gmail.com>
Date: Mon, 16 Jun 2014 21:02:54 +0000
Subject: [PATCH] chore(deploy): make deploy tasks for site not parallel

---
 scripts/circle/deploy.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/circle/deploy.sh b/scripts/circle/deploy.sh
index 7d3e6a13ec..442c9d66dd 100755
--- a/scripts/circle/deploy.sh
+++ b/scripts/circle/deploy.sh
@@ -38,16 +38,17 @@ function run {
     fi
     ;;
   1)
-    # Update site config: release only
-    if [[ "$IS_RELEASE" == "true" ]]; then
-      ./scripts/site/config.sh
-    fi
     # Update app-base: release only
     if [[ "$IS_RELEASE" == "true" ]]; then
       ./scripts/app-base/publish.sh
     fi
     ;;
   2)
+    # Be sure to update the site one after the other,
+    # so the tasks don't have a push conflict
+    if [[ "$IS_RELEASE" == "true" ]]; then
+      ./scripts/site/config.sh
+    fi
     # Update docs
     ./scripts/site/docs.sh --version-name="$VERSION_NAME"
     ;;