Fixing travis.yml

This commit is contained in:
Tomasz Drwięga 2016-07-11 18:23:24 +02:00
parent 9eeafecd76
commit 248428657d
2 changed files with 22 additions and 17 deletions

View File

@ -9,3 +9,8 @@ trim_trailing_whitespace=true
max_line_length=120 max_line_length=120
insert_final_newline=true insert_final_newline=true
[.travis.yml]
indent_style=space
indent_size=2
tab_width=8
end_of_line=lf

View File

@ -44,8 +44,8 @@ addons:
script: script:
- if [ "$RUN_TESTS" = "true" ]; then ./test.sh; fi - if [ "$RUN_TESTS" = "true" ]; then ./test.sh; fi
install: install: |
- [ "$RUN_COVERAGE" = "true" ] && [ "$RUN_COVERAGE" = "true" ] &&
wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
tar xzf master.tar.gz && tar xzf master.tar.gz &&
mkdir kcov-master/build && mkdir kcov-master/build &&
@ -55,8 +55,8 @@ install:
cd ../.. cd ../..
after_success: after_success:
- [ "$RUN_COVERAGE" = "true" ] && ./scripts/cov.sh "$KCOV_CMD" - true && [ "$RUN_COVERAGE" = "true" ] && ./scripts/cov.sh "$KCOV_CMD"
- [ $TRAVIS_BRANCH = master ] && - true && [ $TRAVIS_BRANCH = master ] &&
[ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_PULL_REQUEST = false ] &&
[ $TRAVIS_RUST_VERSION = stable ] && [ $TRAVIS_RUST_VERSION = stable ] &&
./scripts/doc.sh && ./scripts/doc.sh &&