aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: change TRAVIS_BUILD_TARGET to CI_BUILD_TARGET on build_ci.sh

Browse Source
This commit is contained in:
Ricardo de Almeida Gonzaga 2016-01-18 17:37:53 -02:00 committed by Lucas De Marchi
parent e816a4845a
commit 0db54e7b36
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -88,5 +88,5 @@ env:
# via the "travis encrypt" command using the project repo's public key # via the "travis encrypt" command using the project repo's public key
- secure: "FjIwqZQV2FhNPWYITX5LZXTE38yYqBaQdbm3QmbEg/30wnPTm1ZOLIU7o/aSvX615ImR8kHoryvFPDQDWc6wWfqTEs3Ytq2kIvcIJS2Y5l/0PFfpWJoH5gRd6hDThnoi+1oVMLvj1+bhn4yFlCCQ2vT/jxoGfiQqqgvHtv4fLzI=" - secure: "FjIwqZQV2FhNPWYITX5LZXTE38yYqBaQdbm3QmbEg/30wnPTm1ZOLIU7o/aSvX615ImR8kHoryvFPDQDWc6wWfqTEs3Ytq2kIvcIJS2Y5l/0PFfpWJoH5gRd6hDThnoi+1oVMLvj1+bhn4yFlCCQ2vT/jxoGfiQqqgvHtv4fLzI="
matrix: matrix:
- TRAVIS_BUILD_TARGET="px4-v2 sitl linux" - CI_BUILD_TARGET="px4-v2 sitl linux"
- TRAVIS_BUILD_TARGET="navio raspilot minlure bebop" - CI_BUILD_TARGET="navio raspilot minlure bebop"

10
Tools/scripts/build_ci.sh
View File

@ -13,9 +13,9 @@ unset CXX CC
export BUILDROOT=/tmp/travis.build.$$ export BUILDROOT=/tmp/travis.build.$$
rm -rf $BUILDROOT rm -rf $BUILDROOT
# If TRAVIS_BUILD_TARGET is not set, default to all of them # If CI_BUILD_TARGET is not set, default to all of them
if [ -z "$TRAVIS_BUILD_TARGET" ]; then if [ -z "$CI_BUILD_TARGET" ]; then
TRAVIS_BUILD_TARGET="sitl linux navio raspilot minlure bebop px4-v2 px4-v4" CI_BUILD_TARGET="sitl linux navio raspilot minlure bebop px4-v2 px4-v4"
fi fi
declare -A build_platforms declare -A build_platforms
@ -45,8 +45,8 @@ waf=modules/waf/waf-light
# get list of boards supported by the waf build # get list of boards supported by the waf build
for board in $($waf list_boards | head -n1); do waf_supported_boards[$board]=1; done for board in $($waf list_boards | head -n1); do waf_supported_boards[$board]=1; done
echo "Targets: $TRAVIS_BUILD_TARGET" echo "Targets: $CI_BUILD_TARGET"
for t in $TRAVIS_BUILD_TARGET; do for t in $CI_BUILD_TARGET; do
echo "Starting make based build for target ${t}..." echo "Starting make based build for target ${t}..."
for v in ${!build_platforms[@]}; do for v in ${!build_platforms[@]}; do
if [[ ${build_platforms[$v]} != *$t* ]]; then if [[ ${build_platforms[$v]} != *$t* ]]; then