From 1d83013e8d26bf8a0e7b34ad5e65543ab8d84840 Mon Sep 17 00:00:00 2001 From: Jeff Wang Date: Fri, 31 Aug 2018 13:41:57 -0700 Subject: [PATCH] Update the deploy script. (#49) * Start over * Added basic docs Added .travis.yml Added scripts to build documentation on the Travis. * Disable several deploy script commend for testing. * fixed the deploy_docs.sh script. * Update travis.yml * Renamed docs to doc * update .gitignore. * Delete .gitignore * Update .travis.yml * Update .travis.yml * Update deploy_docs.sh * Update .travis.yml * Develop doc (#1) * Add paddle submodule * Update the build script. * Update script * Use gen_doc_lib instead. * Move files around * cache external * Update submodule * try to cache batch 1 * add test code * Update Paddle submodule * Update submodule * update script to print more * update python path * test * test * test * clean up the code * Update Script (#2) * add new file * Develop doc (#3) * Add the rest of the submodules into the system * Provide first symlink fit a line * Update the rest of book to symlinks * add models submodule * Add link for models * Update deploy_docs * update to use lite 2 * Develop doc (#4) * Include the en book * Deploy mobile and models. * Use external approach. --- .travis.yml | 5 +++ scripts/deploy_en_external_docs.sh | 52 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100755 scripts/deploy_en_external_docs.sh diff --git a/.travis.yml b/.travis.yml index 9aa97324a..ab0101fbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ env: - JOB=doc - JOB=lite_lib - JOB=lite_lib2 + - JOB=en_external_doc addons: apt: @@ -43,6 +44,10 @@ script: if [ $JOB == "lite_lib2" ]; then scripts/build_doc_lib_lite2.sh fi + + if [ $JOB == "en_external_doc" ]; then scripts/deploy_en_external_docs.sh + fi + #before_cache: # # Save tagged docker images # - > diff --git a/scripts/deploy_en_external_docs.sh b/scripts/deploy_en_external_docs.sh new file mode 100755 index 000000000..c275adf46 --- /dev/null +++ b/scripts/deploy_en_external_docs.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +# Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script is used to deploy the English specific documents. +# EX: Book, Mobile and Models. They are not yet consolidated into one Doc tree. + +exit_code=0 + +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 + echo "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 + +echo "Deploy book under docker environment" +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=/FluidDoc/external/Paddle \ + -e PYTHONPATH=/FluidDoc/external/Paddle/build/python \ + -v "$PWD:/FluidDoc" \ + -w /FluidDoc \ + paddlepaddle/paddle:latest-dev \ + /bin/bash -c 'curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH /FluidDoc/external /FluidDoc/external $PPO_SCRIPT_BRANCH' || exit_code=$(( exit_code | $? )) + +exit $exit_code -- GitLab