1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-23 05:23:50 +01:00

Merge pull request #1526 from Kijewski/rebase-on-master

Travis: auto rebase on master before running
This commit is contained in:
René Kijewski 2014-08-11 18:22:59 +02:00
commit 3b7591f3bc

View File

@ -22,7 +22,13 @@ 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:
- git rebase riot/master || git rebase --abort
- ./dist/tools/compile_test/compile_test.py - ./dist/tools/compile_test/compile_test.py
- make -C ./tests/unittests test BOARD=native - make -C ./tests/unittests test BOARD=native
- make -C ./tests/unittests test BOARD=qemu-i386 - make -C ./tests/unittests test BOARD=qemu-i386