From c2fc896f5b2896fc6509e720e7dc08527495927f Mon Sep 17 00:00:00 2001
From: Yi Wang <yiwang01@baidu.com>
Date: Thu, 22 Jun 2017 19:05:28 -0700
Subject: [PATCH] Simplify Travis CI configuration

---
 .travis.yml                                         |  2 --
 paddle/scripts/travis/build_and_test.sh             | 12 ------------
 paddle/scripts/travis/{docs.sh => build_doc.sh}     | 13 ++++++++-----
 .../scripts/travis/{precommit.sh => check_style.sh} |  8 ++++----
 paddle/scripts/travis/main.sh                       | 12 +++++-------
 5 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100755 paddle/scripts/travis/build_and_test.sh
 rename paddle/scripts/travis/{docs.sh => build_doc.sh} (84%)
 rename paddle/scripts/travis/{precommit.sh => check_style.sh} (54%)

diff --git a/.travis.yml b/.travis.yml
index 87cef10b2b1..915c23b7ab5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ group: deprecated-2017Q2
 language: cpp
 cache:
   directories:
-    - $HOME/third_party
     - $HOME/.ccache
     - $HOME/.cache/pip
 sudo: required
@@ -18,7 +17,6 @@ addons:
     packages:
       - gcc-4.8
       - g++-4.8
-      - gfortran-4.8
       - git
       - build-essential
       - python
diff --git a/paddle/scripts/travis/build_and_test.sh b/paddle/scripts/travis/build_and_test.sh
deleted file mode 100755
index f2cbc561652..00000000000
--- a/paddle/scripts/travis/build_and_test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-source ./common.sh
-
-NPROC=1
-export PYTHONPATH=/opt/python/2.7.12/lib/python2.7/site-packages
-export PYTHONHOME=/opt/python/2.7.12
-export PATH=/opt/python/2.7.12/bin:${PATH}
-cmake .. -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DON_TRAVIS=ON -DWITH_COVERAGE=ON -DCOVERALLS_UPLOAD=ON ${EXTRA_CMAKE_OPTS}
-NRPOC=`nproc`
-make -j $NPROC
-make coveralls
-sudo make install
diff --git a/paddle/scripts/travis/docs.sh b/paddle/scripts/travis/build_doc.sh
similarity index 84%
rename from paddle/scripts/travis/docs.sh
rename to paddle/scripts/travis/build_doc.sh
index c784293695b..88264d8c262 100755
--- a/paddle/scripts/travis/docs.sh
+++ b/paddle/scripts/travis/build_doc.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
+set -e
+
+# Create the build directory for CMake.
+mkdir -p $TRAVIS_BUILD_DIR/build
+cd $TRAVIS_BUILD_DIR/build
 
-# Add set -e, cd to directory.
-source ./common.sh
 # Compile Documentation only.
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_STYLE_CHECK=OFF ${EXTRA_CMAKE_OPTS}
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_STYLE_CHECK=OFF
 mkdir output
 make -j `nproc`
 find .. -name '*whl' | xargs pip install  # install all wheels.
 rm -rf *
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DWITH_GPU=OFF -DWITH_DOC=ON ${EXTRA_CMAKE_OPTS}
-make paddle_docs paddle_docs_cn
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=ON
+make -j `nproc` paddle_docs paddle_docs_cn
 
 # check websites for broken links
 linkchecker doc/en/html/index.html
diff --git a/paddle/scripts/travis/precommit.sh b/paddle/scripts/travis/check_style.sh
similarity index 54%
rename from paddle/scripts/travis/precommit.sh
rename to paddle/scripts/travis/check_style.sh
index 7a59b1131d0..4754bdd4c80 100755
--- a/paddle/scripts/travis/precommit.sh
+++ b/paddle/scripts/travis/check_style.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 function abort(){
-    echo "Your commit not fit PaddlePaddle code style" 1>&2
-    echo "Please use pre-commit scripts to auto-format your code" 1>&2
+    echo "Your change doesn't follow PaddlePaddle's code style." 1>&2
+    echo "Please use pre-commit to reformat your code and git push again." 1>&2
     exit 1
 }
 
 trap 'abort' 0
 set -e
-source common.sh
-cd ..
+
+cd $TRAVIS_BUILD_DIR
 export PATH=/usr/bin:$PATH
 pre-commit install
 clang-format --version
diff --git a/paddle/scripts/travis/main.sh b/paddle/scripts/travis/main.sh
index 13f2552d29d..30afe60f608 100755
--- a/paddle/scripts/travis/main.sh
+++ b/paddle/scripts/travis/main.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 cd `dirname $0`
 
-if [ ${JOB} == "BUILD_AND_TEST" ]; then
-  ./build_and_test.sh
-elif [ ${JOB} == "DOCS" ]; then
-  ./docs.sh
+if [ ${JOB} == "DOCS" ]; then
+  ./build_doc.sh
 elif [ ${JOB} == "PRE_COMMIT" ]; then
-  ./precommit.sh
+  ./check_style.sh
 else
-  echo Unknown job ${JOB}
-  exit 1
+  echo "Unknown Travis CI job: ${JOB}"
+  exit 0 # Don't fail due to unknown Travis CI job.
 fi
-- 
GitLab