Merge pull request #524 from lewisl9029/feature-deferred-gh-pages-clone

Feature deferred gh pages clone

Author: lewisl9029

circle.yml

@@ -1,7 +1,3 @@
-# machine:
-#   services:
-#     - docker
-
 machine:
   node:
     version: 4.2.1
@@ -19,23 +15,22 @@ dependencies:
     - "~/nvm/versions/node/v4.2.1/lib/node_modules"
     - "~/nvm/versions/node/v4.2.1/bin"
   pre:
-    - /bin/bash scripts/toc-install-deps.sh
+    - >
+      if [ ! -e ~/nvm/versions/node/v4.2.1/bin/npm ] || \
+        [ ! -e ~/nvm/versions/node/v4.2.1/bin/gulp ] || \
+        [ ! -e ~/nvm/versions/node/v4.2.1/bin/http-server ] || \
+        [ ! -e ~/nvm/versions/node/v4.2.1/bin/jspm ] || \
+        [ ! -e ~/nvm/versions/node/v4.2.1/bin/ionic ];
+      then
+        /bin/bash scripts/toc-install-deps.sh
+      else
+        echo "Cached global dependencies exist. Skipping install."
+      fi
   override:
     - npm install
     - npm rebuild node-sass
     - npm rebuild optipng-bin
     - jspm install
-    # - >
-    #     docker run \
-    #       -v $(pwd):/toc \
-    #       lewisl9029/toc-dev:latest \
-    #       npm install
-    # - >
-    #     docker run \
-    #       -v $(pwd):/toc \
-    #       -e JSPM_GITHUB_AUTH_TOKEN=$JSPM_GITHUB_AUTH_TOKEN \
-    #       lewisl9029/toc-dev:latest \
-    #       jspm install
 
 test:
   override:
@@ -46,11 +41,9 @@ deployment:
     branch: /.*/
     owner: lewisl9029
     commands:
-      - /bin/bash scripts/toc-deploy-prepare.sh
       - /bin/bash scripts/toc-deploy-staging.sh
   production:
     tag: /v[0-9]+(\.[0-9]+)*/
     owner: lewisl9029
     commands:
-      - /bin/bash scripts/toc-deploy-prepare.sh
       - /bin/bash scripts/toc-deploy-production.sh

scripts/toc-deploy-prepare.sh

@@ -4,17 +4,8 @@ set -e
 TOC_VERSION="$(git describe --abbrev=0 --tags)"
 TOC_RELEASE=$TOC_VERSION
 TOC_URL="http://toc.im/releases/$TOC_RELEASE"
+TOC_ENV="production"
 
 gulp package --prod
 
-rm -rf ../toc-pages/app
-rm -rf ../toc-pages/index.html
-rm -rf ../toc-pages/landing.css
-rm -rf ../toc-pages/landing.js
-
-cp -r www/* ../toc-pages/
-
-# clean up previous staging releases
-rm -rf ../toc-pages/releases/staging
-
 source scripts/toc-deploy-publish.sh

scripts/toc-deploy-production.sh

@@ -1,15 +1,34 @@
 #!/usr/bin/env bash
 set -e
 
-rm -rf ../toc-pages/releases/$TOC_RELEASE
-
-mkdir -p ../toc-pages/releases/$TOC_RELEASE
-cp -r www/* ../toc-pages/releases/$TOC_RELEASE/
-
 tar -cvf "$CIRCLE_ARTIFACTS/Toc Messenger.tar" www
 cp "Toc Messenger.apk" $CIRCLE_ARTIFACTS/
 cp "Toc Messenger.ipa" $CIRCLE_ARTIFACTS/
 
+git config --global user.email "[email protected]"
+git config --global user.name "Lewis Liu"
+git config --global push.default matching
+
+git clone [email protected]:lewisl9029/toc.git ../toc-pages \
+  --branch gh-pages --depth 1
+
+if [ $TOC_ENV == "production" ];
+then
+  rm -rf ../toc-pages/app
+  rm -rf ../toc-pages/index.html
+  rm -rf ../toc-pages/landing.css
+  rm -rf ../toc-pages/landing.js
+
+  cp -r www/* ../toc-pages/
+
+  # clean up previous staging releases
+  rm -rf ../toc-pages/releases/staging
+fi
+
+rm -rf ../toc-pages/releases/$TOC_RELEASE
+
+mkdir -p ../toc-pages/releases/$TOC_RELEASE
+cp -r www/* ../toc-pages/releases/$TOC_RELEASE/
 
 cd ../toc-pages
 
@@ -19,5 +38,4 @@ git push origin gh-pages
 
 cd ../toc
 
-
 echo $TOC_URL

scripts/toc-deploy-publish.sh

@@ -4,6 +4,7 @@ set -e
 TOC_VERSION="$(git describe --abbrev=0 --tags)"
 TOC_RELEASE="staging/$CIRCLE_BRANCH"
 TOC_URL="http://toc.im/releases/$TOC_RELEASE"
+TOC_ENV="staging"
 
 TOC_COMMIT_VERSION="v$(git log --format=%B -n 1)"