From 1433a6e1f87b11b11849ec1b520762535efd3266 Mon Sep 17 00:00:00 2001 From: Paul Rogalinski Date: Fri, 3 Apr 2015 18:00:44 +0200 Subject: [PATCH] cleanup, prepare for a pr --- .travis.sh | 7 +------ .travis.yml | 43 ++++++++++++++++++++----------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/.travis.sh b/.travis.sh index 7a8b11058..3c2537079 100755 --- a/.travis.sh +++ b/.travis.sh @@ -13,13 +13,7 @@ if [ $RUNTESTS ] ; then elif [ $PUBLISHDOCS ] ; then if [ $PUBLISH_URL ] ; then - #sudo apt-get install ruby1.9.1 ruby1.9.1-dev rubygems zlib1g-dev libssl-dev sudo apt-get install zlib1g-dev libssl-dev wkhtmltopdf libxml2-dev libxslt-dev #ruby-rvm - # rvmsudo gem1.9.1 install gimli - - #rvmsudo rvm package install openssl - #rvmsudo rvm install 1.9.3-p551 -j 4 - #rvmsudo rvm use --default 1.9.3-p551 rvmsudo gem install gimli ./build_docs.sh @@ -68,3 +62,4 @@ else make -j2 fi fi + diff --git a/.travis.yml b/.travis.yml index f43556702..fa6191480 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,26 @@ env: -# - RUNTESTS=True -# - PUBLISHMETA=True + - RUNTESTS=True + - PUBLISHMETA=True - PUBLISHDOCS=True -# - TARGET=CC3D -# - TARGET=CC3D OPBL=yes -# - TARGET=CHEBUZZF3 -# - TARGET=CJMCU -# - TARGET=EUSTM32F103RC -# - TARGET=SPRACINGF3 -# - TARGET=NAZE -# - TARGET=NAZE32PRO -# - TARGET=OLIMEXINO -# - TARGET=PORT103R -# - TARGET=SPARKY -# - TARGET=STM32F3DISCOVERY -# - TARGET=ALIENWIIF1 -# - TARGET=ALIENWIIF3 + - TARGET=CC3D + - TARGET=CC3D OPBL=yes + - TARGET=CHEBUZZF3 + - TARGET=CJMCU + - TARGET=EUSTM32F103RC + - TARGET=SPRACINGF3 + - TARGET=NAZE + - TARGET=NAZE32PRO + - TARGET=OLIMEXINO + - TARGET=PORT103R + - TARGET=SPARKY + - TARGET=STM32F3DISCOVERY + - TARGET=ALIENWIIF1 + - TARGET=ALIENWIIF3 # We use cpp for unit tests, and c for the main project. language: cpp compiler: clang -rvm: - - 1.9.1 - before_install: - sudo apt-get update - wget "https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q3-update/+download/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2" @@ -36,7 +33,7 @@ install: before_script: arm-none-eabi-gcc --version script: ./.travis.sh -#notifications: -# irc: "chat.freenode.net#cleanflight" -# use_notice: true -# skip_join: true +notifications: + irc: "chat.freenode.net#cleanflight" + use_notice: true + skip_join: true \ No newline at end of file