From 0cbe120d8c06a1c064293918986264cb320bdb78 Mon Sep 17 00:00:00 2001
From: Yi Wang <yi.wang.2005@gmail.com>
Date: Thu, 22 Jun 2017 21:16:07 -0700
Subject: [PATCH] Remove paddle/script/travis/main.sh

---
 .travis.yml                   | 10 ++++------
 paddle/scripts/travis/main.sh | 11 -----------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100755 paddle/scripts/travis/main.sh

diff --git a/.travis.yml b/.travis.yml
index 6b4fb4c4b65..2c46da71e75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ dist: trusty
 os:
   - linux
 env:
-  - JOB=DOCS
-  - JOB=PRE_COMMIT
+  - JOB=build_doc
+  - JOB=check_style
 addons:
   apt:
     packages:
@@ -32,7 +32,7 @@ addons:
       - libtool
       - ccache
 before_install:
-  - if [[ "$JOB" == "PRE_COMMIT" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
+  - if [[ "$JOB" == "check_style" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
   # Paddle is using protobuf 3.1 currently. Protobuf 3.2 breaks the compatibility. So we specify the python 
   # protobuf version.
   - pip install numpy wheel 'protobuf==3.1' sphinx==1.5.6 recommonmark sphinx-rtd-theme==0.1.9 virtualenv pre-commit requests==2.9.2 LinkChecker
@@ -41,9 +41,7 @@ before_install:
   - |
     function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
 script:
-  - | 
-    timeout 2580 paddle/scripts/travis/main.sh  # 43min timeout
-    RESULT=$?; if [ $RESULT -eq 0 ] || [ $RESULT -eq 142 ]; then true; else false; fi;
+  - paddle/scripts/travis/$JOB.sh
 notifications:
   email:
     on_success: change
diff --git a/paddle/scripts/travis/main.sh b/paddle/scripts/travis/main.sh
deleted file mode 100755
index 30afe60f608..00000000000
--- a/paddle/scripts/travis/main.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-
-if [ ${JOB} == "DOCS" ]; then
-  ./build_doc.sh
-elif [ ${JOB} == "PRE_COMMIT" ]; then
-  ./check_style.sh
-else
-  echo "Unknown Travis CI job: ${JOB}"
-  exit 0 # Don't fail due to unknown Travis CI job.
-fi
-- 
GitLab