From 2bd5a61790eb7c204ff840dc79617a39f9aba445 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Thu, 17 Nov 2016 12:09:43 +0800
Subject: [PATCH] Update ci

---
 build/cooking.demo.js |  2 +-
 build/deploy-ci.sh    | 40 ++++++++++++++++++++--------------------
 build/release.sh      |  5 +++++
 package.json          |  3 +--
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/build/cooking.demo.js b/build/cooking.demo.js
index d388d1b3c..92c978fdf 100644
--- a/build/cooking.demo.js
+++ b/build/cooking.demo.js
@@ -26,7 +26,7 @@ cooking.set({
       favicon: './examples/favicon.ico'
     }
   ],
-  publicPath: process.env.CI_ENV || '/',
+  publicPath: process.env.CI_ENV || '',
   hash: true,
   devServer: {
     port: 8085,
diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh
index ecd6bc512..5c65c7fb4 100644
--- a/build/deploy-ci.sh
+++ b/build/deploy-ci.sh
@@ -1,15 +1,16 @@
 #! /bin/sh
 mkdir temp_web
+git config --global user.name "element_bot"
+git config --global user.email "element_bot"
 
 # build dev site
-if [ "$TRAVIS_BRANCH" = "master" ] && [ "$GH_TOKEN" ]; then
-  npm run deploy:dev
+if [ "$GH_TOKEN" ]; then
+  npm run build:file && CI_ENV=/dev/$TRAVIS_BRANCH/ node_modules/.bin/cooking build -c build/cooking.demo.js
   cd temp_web
   git clone https://$GH_TOKEN@github.com/ElementUI/dev.git && cd dev
-  git config user.name "element_bot"
-  git config user.email "element_bot"
-  rm -rf `find * ! -name README.md`
-  cp -rf ../../examples/element-ui/** .
+  mkdir $TRAVIS_BRANCH
+  rm -rf $TRAVIS_BRANCH/**
+  cp -rf ../../examples/element-ui/** $TRAVIS_BRANCH/
   git add -A .
   git commit -m "$TRAVIS_COMMIT_MSG"
   git push origin master
@@ -17,26 +18,25 @@ if [ "$TRAVIS_BRANCH" = "master" ] && [ "$GH_TOKEN" ]; then
 fi
 
 # push theme-default
-if [ "$TRAVIS_BRANCH" = "master" ] && [ "$GH_TOKEN" ]; then
+if [ "$GH_TOKEN" ]; then
   cd temp_web
-  git clone https://$GH_TOKEN@github.com/ElementUI/theme-default.git && cd theme-default
-  git config user.name "element_bot"
-  git config user.email "element_bot"
+  git clone -b $TRAVIS_BRANCH https://$GH_TOKEN@github.com/ElementUI/theme-default.git && cd theme-default
   rm -rf *
   cp -rf ../../packages/theme-default/** .
   git add -A .
   git commit -m "$TRAVIS_COMMIT_MSG"
-  git push origin master --tags
+  git push origin $TRAVIS_BRANCH
   cd ../..
 fi
 
 if [ "$TRAVIS_TAG" ] && [ "$GH_TOKEN" ]; then
+  # site sub folder
+  SUB_FOLDER=$(echo $TRAVIS_TAG | grep -o -E '^\d+\.\d+')
+
   # build lib
   npm run dist
   cd temp_web
   git clone https://$GH_TOKEN@github.com/ElementUI/lib.git && cd lib
-  git config user.name "element_bot"
-  git config user.email "element_bot"
   rm -rf `find * ! -name README.md`
   cp -rf ../../lib/** .
   git add -A .
@@ -48,8 +48,6 @@ if [ "$TRAVIS_TAG" ] && [ "$GH_TOKEN" ]; then
   # build theme-default
   cd temp_web
   git clone https://$GH_TOKEN@github.com/ElementUI/theme-default.git && cd theme-default
-  git config user.name "element_bot"
-  git config user.email "element_bot"
   rm -rf *
   cp -rf ../../packages/theme-default/** .
   git add -A .
@@ -61,12 +59,14 @@ if [ "$TRAVIS_TAG" ] && [ "$GH_TOKEN" ]; then
   # build site
   npm run deploy:build
   cd temp_web
-  git clone https://$GH_TOKEN@github.com/ElemeFE/element.git && cd element
-  git config user.name "element_bot"
-  git config user.email "element_bot"
-  git checkout gh-pages
-  rm -rf `find * ! -name README.md`
+  git clone -b gh-pages https://$GH_TOKEN@github.com/ElemeFE/element.git && cd element
+
+  # only remove files
+  mkdir $SUB_FOLDER
+  rm -f *
+  rm -rf $SUB_FOLDER/**
   cp -rf ../../examples/element-ui/** .
+  cp -rf ../../examples/element-ui/** $SUB_FOLDER/
   git add -A .
   git commit -m "$TRAVIS_COMMIT_MSG"
   git push origin gh-pages
diff --git a/build/release.sh b/build/release.sh
index 7f9401da1..bfd1fb61c 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -1,3 +1,8 @@
+git checkout dev
+git pull eleme dev --rebase
+git checkout master
+git merge dev
+
 set -e
 echo "Enter release version: "
 read VERSION
diff --git a/package.json b/package.json
index c2059e14f..0b9e15c23 100644
--- a/package.json
+++ b/package.json
@@ -16,14 +16,13 @@
     "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage && lerna clean --yes",
     "deploy": "npm run deploy:build && gh-pages -d examples/element-ui --remote eleme && del examples/element-ui",
     "deploy:build": "npm run build:file && cooking build -c build/cooking.demo.js -p && echo element.eleme.io>>examples/element-ui/CNAME",
-    "deploy:dev": "npm run build:file && CI_ENV=/dev/ cooking build -c build/cooking.demo.js",
     "dev": "npm run bootstrap && npm run build:file && cooking watch -c build/cooking.demo.js -p",
     "dev:play": "npm run build:file && cross-env PLAY_ENV=true cooking watch -c build/cooking.demo.js -p",
     "dist": "npm run clean && npm run build:file && npm run lint && cooking build -c build/cooking.conf.js,build/cooking.common.js,build/cooking.component.js -p && npm run build:utils && npm run build:theme",
     "dist:all": "node build/bin/build-all.js && npm run build:theme",
     "i18n": "node build/bin/i18n.js",
     "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
-    "pub": "git checkout master && git pull eleme master --rebase && sh build/release.sh",
+    "pub": "sh build/release.sh",
     "pub:all": "npm run dist:all && lerna publish",
     "test": "npm run lint && CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run",
     "test:watch": "karma start test/unit/karma.conf.js"