RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

dist: Recall build_and_test.sh after rebase if it was changed

Browse Source
This commit is contained in:
Martine Lenders 2016-03-01 13:54:04 +01:00
parent c239e359f6
commit 77bf5277f6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ then
if [ "$BUILDTEST_MCU_GROUP" == "static-tests" ]
then
RESULT=0
RECALL="$1"
if git diff master HEAD -- .travis.yml &> /dev/null; then
# check if .travis.yml was changed in the current PR and skip if so
@ -43,6 +44,15 @@ then
fi
fi
if [ "$RECALL" != "recall" ]; then
if git diff master HEAD -- "$0" &> /dev/null; then
git rebase master || git rebase --abort
"$0" "recall"
exit $?
fi
fi
git rebase master || git rebase --abort
RESULT=$(set_result $? $RESULT)