Merge pull request #18 from pkuyym/fix-17

Some fix for CI.

.clang_format.hook

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-readonly VERSION="3.8"
+readonly VERSION="3.9"
 
 version=$(clang-format -version)
 

.pre-commit-config.yaml

@@ -33,11 +33,3 @@
         entry: bash .clang_format.hook -i
         language: system
         files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx|cuh|proto)$
--   repo: local
-    hooks:
-    -   id: convert-markdown-into-html
-        name: convert-markdown-into-html
-        description: Convert README.md into index.html
-        entry: python .pre-commit-hooks/convert_markdown_into_html.py
-        language: system
-        files: .+README\.md$

.travis.yml

@@ -17,20 +17,26 @@ addons:
       - python-pip
       - python2.7-dev
   ssh_known_hosts: 52.76.173.135
+
 before_install:
   -  sudo pip install -U virtualenv pre-commit pip
   -  docker pull paddlepaddle/paddle:latest
+
 script:
-  -  .travis/precommit.sh
-  -  docker run -i --rm -v "$PWD:/py_unittest" paddlepaddle/paddle:latest /bin/bash -c
-    'cd /py_unittest; sh .travis/unittest.sh'
+  - exit_code=0
+  - .travis/precommit.sh || exit_code=$(( exit_code | $? ))
+  - docker run -i --rm -v "$PWD:/py_unittest" paddlepaddle/paddle:latest /bin/bash -c
+    'cd /py_unittest; sh .travis/unittest.sh' || exit_code=$(( exit_code | $? ))
   - |
-    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;
+    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit $exit_code; fi;
+    if [[ "$TRAVIS_BRANCH" != "develop"  && ! "$TRAVIS_BRANCH" =~ ^v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then echo "not develop branch, no deploy"; exit $exit_code; fi;
     export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/master/scripts/deploy/deploy_docs.sh
     export MODELS_DIR=`pwd`
     cd ..
     curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH $MODELS_DIR
+    exit_code=$(( exit_code | $? ))
+    exit $exit_code
+
 notifications:
   email:
     on_success: change

.travis/unittest.sh

@@ -24,13 +24,6 @@ unittest(){
 trap 'abort' 0
 set -e
 
-for proj in */ ; do
-    if [ -d $proj ]; then
-        unittest $proj
-        if [ $? != 0 ]; then
-            exit 1
-        fi
-    fi
-done
+unittest .
 
 trap : 0