Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: update ci install script

This commit is contained in:
Pierre Kancir 2016-10-16 11:30:59 +02:00 committed by Lucas De Marchi
parent f7d19a6cd7
commit 10c3d82c67
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -22,6 +22,8 @@ addons:
- ccache - ccache
- genromfs - genromfs
- libc6-i386 - libc6-i386
- libxml2-dev
- libxslt1-dev
- python-pip - python-pip
- python-dev - python-dev
- zlib1g-dev - zlib1g-dev

5
Tools/scripts/install-apt-ci.sh
View File

@ -4,7 +4,8 @@
set -ex set -ex
PKGS="build-essential gawk ccache genromfs libc6-i386 \ PKGS="build-essential gawk ccache genromfs libc6-i386 \
python-dev python-pip zlib1g-dev gcc-4.9 g++-4.9 cmake cmake-data" # clang-3.7 llvm-3.7" libxml2-dev libxslt1-dev python-dev python-pip zlib1g-dev \
gcc-4.9 g++-4.9 cmake cmake-data" # clang-3.7 llvm-3.7"
read -r UBUNTU_CODENAME <<<$(lsb_release -c -s) read -r UBUNTU_CODENAME <<<$(lsb_release -c -s)
@ -20,4 +21,4 @@ fi
#sudo add-apt-repository "deb http://llvm.org/apt/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-3.7 main" -y #sudo add-apt-repository "deb http://llvm.org/apt/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-3.7 main" -y
sudo apt-get -qq -y --force-yes update sudo apt-get -qq -y --force-yes update
sudo apt-get -qq -y --force-yes remove clang llvm sudo apt-get -qq -y --force-yes remove clang llvm
sudo apt-get -y --force-yes install $PKGS sudo apt-get -y --force-yes install $PKGS