cleanup, prepare for a pr

This commit is contained in:
Paul Rogalinski 2015-04-03 18:00:44 +02:00
parent e6006232c8
commit 1433a6e1f8
2 changed files with 21 additions and 29 deletions

View File

@ -13,13 +13,7 @@ if [ $RUNTESTS ] ; then
elif [ $PUBLISHDOCS ] ; then elif [ $PUBLISHDOCS ] ; then
if [ $PUBLISH_URL ] ; 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 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 rvmsudo gem install gimli
./build_docs.sh ./build_docs.sh
@ -68,3 +62,4 @@ else
make -j2 make -j2
fi fi
fi fi

View File

@ -1,29 +1,26 @@
env: env:
# - RUNTESTS=True - RUNTESTS=True
# - PUBLISHMETA=True - PUBLISHMETA=True
- PUBLISHDOCS=True - PUBLISHDOCS=True
# - TARGET=CC3D - TARGET=CC3D
# - TARGET=CC3D OPBL=yes - TARGET=CC3D OPBL=yes
# - TARGET=CHEBUZZF3 - TARGET=CHEBUZZF3
# - TARGET=CJMCU - TARGET=CJMCU
# - TARGET=EUSTM32F103RC - TARGET=EUSTM32F103RC
# - TARGET=SPRACINGF3 - TARGET=SPRACINGF3
# - TARGET=NAZE - TARGET=NAZE
# - TARGET=NAZE32PRO - TARGET=NAZE32PRO
# - TARGET=OLIMEXINO - TARGET=OLIMEXINO
# - TARGET=PORT103R - TARGET=PORT103R
# - TARGET=SPARKY - TARGET=SPARKY
# - TARGET=STM32F3DISCOVERY - TARGET=STM32F3DISCOVERY
# - TARGET=ALIENWIIF1 - TARGET=ALIENWIIF1
# - TARGET=ALIENWIIF3 - TARGET=ALIENWIIF3
# We use cpp for unit tests, and c for the main project. # We use cpp for unit tests, and c for the main project.
language: cpp language: cpp
compiler: clang compiler: clang
rvm:
- 1.9.1
before_install: before_install:
- sudo apt-get update - 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" - 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 before_script: arm-none-eabi-gcc --version
script: ./.travis.sh script: ./.travis.sh
#notifications: notifications:
# irc: "chat.freenode.net#cleanflight" irc: "chat.freenode.net#cleanflight"
# use_notice: true use_notice: true
# skip_join: true skip_join: true