提交 2a5a8e79 编写于 作者: Y Yu Yang

Fix Travis-CI when using rebase.

* The $TRAVIS_COMMIT_RANGE could be not existed, because the git history
  can be changed and rebased. Here we alway run Travis-CI when `git diff`
  cannot return the modified files.
* Also do not push docs update if is not PaddlePaddle/Paddle.
上级 0cdfa8cd
...@@ -42,10 +42,13 @@ addons: ...@@ -42,10 +42,13 @@ addons:
before_install: before_install:
- | - |
if [ ${JOB} == "BUILD_AND_TEST" ]; then if [ ${JOB} == "BUILD_AND_TEST" ]; then
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(\.rst$)|(\.jpg$)|(\.png$)' local change_list=`git diff --name-only $TRAVIS_COMMIT_RANGE`
then if [ $? -eq 0 ]; then # if git diff return no zero, then rerun unit test.
echo "Only markdown docs were updated, stopping build process." if ! echo ${change_list} | grep -qvE '(\.md$)|(\.rst$)|(\.jpg$)|(\.png$)'
exit then
echo "Only markdown docs were updated, stopping build process."
exit
fi
fi fi
fi fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo paddle/scripts/travis/before_install.linux.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo paddle/scripts/travis/before_install.linux.sh; fi
......
...@@ -47,17 +47,20 @@ if [ $? -eq 0 ]; then ...@@ -47,17 +47,20 @@ if [ $? -eq 0 ]; then
fi fi
set -e set -e
# Commit if [ -n $SSL_KEY ]; then # Only push updated docs for github.com/PaddlePaddle/Paddle.
git add . # Commit
git config user.name "Travis CI" git add .
git config user.email "paddle-dev@baidu.com" git config user.name "Travis CI"
git commit -m "Deploy to GitHub Pages: ${SHA}" git config user.email "paddle-dev@baidu.com"
git commit -m "Deploy to GitHub Pages: ${SHA}"
# Set ssh private key
openssl aes-256-cbc -K $SSL_KEY -iv $SSL_IV -in ../../paddle/scripts/travis/deploy_key.enc -out deploy_key -d # Set ssh private key
chmod 600 deploy_key openssl aes-256-cbc -K $SSL_KEY -iv $SSL_IV -in ../../paddle/scripts/travis/deploy_key.enc -out deploy_key -d
eval `ssh-agent -s` chmod 600 deploy_key
ssh-add deploy_key eval `ssh-agent -s`
ssh-add deploy_key
# Push
git push $SSH_REPO $TARGET_BRANCH # Push
git push $SSH_REPO $TARGET_BRANCH
fi
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册