riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

travis: fix git complaining about 'ambiguous argument'

Browse Source
This commit is contained in:
Cenk Gündoğan 2015-12-06 22:30:00 +01:00
parent a3732a768c
commit 5f201f1856
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -30,10 +30,6 @@ install:
- git config --global user.email "travis@example.com" - git config --global user.email "travis@example.com"
- git config --global user.name "Travis CI" - git config --global user.name "Travis CI"
- git remote add riot https://github.com/RIOT-OS/RIOT.git
- git fetch riot master
- git log -1 --pretty=format:%H riot/master
script: script:
- ./dist/tools/travis-scripts/build_and_test.sh - ./dist/tools/travis-scripts/build_and_test.sh

6
dist/tools/travis-scripts/build_and_test.sh vendored
View File

@ -28,7 +28,7 @@ then
then then
RESULT=0 RESULT=0
git rebase riot/master || git rebase --abort git rebase master || git rebase --abort
RESULT=$(set_result $? $RESULT) RESULT=$(set_result $? $RESULT)
./dist/tools/whitespacecheck/check.sh master ./dist/tools/whitespacecheck/check.sh master
@ -56,7 +56,7 @@ then
./dist/tools/cppcheck/check.sh master --diff-filter=AC ./dist/tools/cppcheck/check.sh master --diff-filter=AC
RESULT=$(set_result $? $RESULT) RESULT=$(set_result $? $RESULT)
./dist/tools/pr_check/pr_check.sh riot/master ./dist/tools/pr_check/pr_check.sh master
RESULT=$(set_result $? $RESULT) RESULT=$(set_result $? $RESULT)
exit $RESULT exit $RESULT
@ -70,5 +70,5 @@ then
# resolved: # resolved:
# - make -C ./tests/unittests all test BOARD=qemu-i386 || exit # - make -C ./tests/unittests all test BOARD=qemu-i386 || exit
fi fi
./dist/tools/compile_test/compile_test.py riot/master ./dist/tools/compile_test/compile_test.py master
fi fi