From e62a655b03d73997daa82908338186ac1da44851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Thu, 7 Jan 2016 16:03:46 +0100
Subject: [PATCH] travis: pass the proper branch to compile_test.py
---
.travis.yml | 1 +
dist/tools/travis-scripts/build_and_test.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 6f6c8e290d..ce205d4f11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ install:
sudo apt-get install $(./dist/tools/travis-scripts/get-pkg-list.py)
- git config --global user.email "travis@example.com"
- git config --global user.name "Travis CI"
+ - test "$TRAVIS_BRANCH" = "master" || git fetch origin $TRAVIS_BRANCH:$TRAVIS_BRANCH
script:
- ./dist/tools/travis-scripts/build_and_test.sh
diff --git a/dist/tools/travis-scripts/build_and_test.sh b/dist/tools/travis-scripts/build_and_test.sh
index b060480dc2..475ad9f1af 100755
--- a/dist/tools/travis-scripts/build_and_test.sh
+++ b/dist/tools/travis-scripts/build_and_test.sh
@@ -70,5 +70,5 @@ then
# resolved:
# - make -C ./tests/unittests all test BOARD=qemu-i386 || exit
fi
- ./dist/tools/compile_test/compile_test.py master
+ ./dist/tools/compile_test/compile_test.py $TRAVIS_BRANCH
fi
--
GitLab