From 9fb760d9319e6ce018a21db8cb51db4ab4393539 Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Wed, 15 Aug 2018 14:13:54 -0700
Subject: [PATCH] Update deploy script

---
 .travis.yml            |  7 +------
 .travis/deploy_docs.sh | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 .travis/deploy_docs.sh

diff --git a/.travis.yml b/.travis.yml
index dcaaf69..8542af9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,12 +22,7 @@ before_install:
 script:
   -  PATH=/tmp/go/bin:$PATH .travis/precommit.sh
   - |
-    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi;
-    if [[ "$TRAVIS_BRANCH" != "develop"  && ! "$TRAVIS_BRANCH" =~ ^v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then echo "not develop branch, no deploy"; exit 0; fi;
-    export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/master/scripts/deploy/deploy_docs.sh
-    export BOOK_DIR=`pwd`
-    cd ..
-    curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH $BOOK_DIR
+     .travis/deploy_docs.sh
 notifications:
   email:
     on_success: change
diff --git a/.travis/deploy_docs.sh b/.travis/deploy_docs.sh
new file mode 100644
index 0000000..5260857
--- /dev/null
+++ b/.travis/deploy_docs.sh
@@ -0,0 +1,36 @@
+exit_code=0
+
+TRAVIS_PULL_REQUEST=false
+TRAVIS_BRANCH=develop_doc
+CONTENT_DEC_PASSWD=12345
+
+if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit $exit_code; fi;
+    
+# Deploy to the the content server if its a "develop" or "release/version" branch
+# The "develop_doc" branch is reserved to test full deploy process without impacting the real content.
+if [ "$TRAVIS_BRANCH" == "develop_doc" ]; then
+    PPO_SCRIPT_BRANCH=develop
+elif [[ "$TRAVIS_BRANCH" == "develop"  ||  "$TRAVIS_BRANCH" =~ ^v|release/[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then
+    PPO_SCRIPT_BRANCH=master
+else
+    # Early exit, this branch doesn't require documentation build
+    exit $exit_code;
+fi
+
+export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/$PPO_SCRIPT_BRANCH/scripts/deploy/deploy_docs.sh
+
+docker run -it \
+    -e CONTENT_DEC_PASSWD=$CONTENT_DEC_PASSWD \
+    -e TRAVIS_BRANCH=$TRAVIS_BRANCH \
+    -e DEPLOY_DOCS_SH=$DEPLOY_DOCS_SH \
+    -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \
+    -e PPO_SCRIPT_BRANCH=$PPO_SCRIPT_BRANCH \
+    -e PADDLE_ROOT=/book \
+    -v "$PWD:/book" \
+    -w /book \
+    paddlepaddle/paddle:latest-dev \
+    /bin/bash
+
+
+-c 'curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH /book /book/build/doc/ $PPO_SCRIPT_BRANCH' || exit_code=$(( exit_code | $? ))
+
-- 
GitLab