Skip to content

Commit fccf22e

Browse files
committed
squash travis build to two
1 parent 54681a5 commit fccf22e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ os:
88

99
env:
1010
# code analysis
11-
- TASK=lint
1211
- TASK=all_test
1312

1413
branches:

tests/travis/run_test.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
#!/bin/bash
22

3-
4-
if [ ${TASK} == "lint" ]; then
5-
make lint || exit -1
6-
echo "Check documentations of c++ code..."
7-
make doc 2>log.txt
8-
(cat log.txt| grep -v ENABLE_PREPROCESSING |grep -v "unsupported tag") > logclean.txt
9-
echo "---------Error Log----------"
10-
cat logclean.txt
11-
echo "----------------------------"
12-
(cat logclean.txt|grep warning) && exit -1
13-
(cat logclean.txt|grep error) && exit -1
3+
if [ ${TASK} == "lint" ] || [ ${TASK} == "all_test" ]; then
4+
if [ ! ${TRAVIS_OS_NAME} == "osx" ]; then
5+
make lint || exit -1
6+
echo "Check documentations of c++ code..."
7+
make doc 2>log.txt
8+
(cat log.txt| grep -v ENABLE_PREPROCESSING |grep -v "unsupported tag") > logclean.txt
9+
echo "---------Error Log----------"
10+
cat logclean.txt
11+
echo "----------------------------"
12+
(cat logclean.txt|grep warning) && exit -1
13+
(cat logclean.txt|grep error) && exit -1
14+
fi
1415
fi
1516

1617

0 commit comments

Comments
 (0)