Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Travis: allow upgrade to gcc 4.8 to fail

Browse Source
This commit is contained in:
Andrew Tridgell 2015-04-05 09:43:57 -07:00
parent 36796fb810
commit 1315ed7ddf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/scripts/install-travis-env.sh
View File

@ -27,12 +27,6 @@ ARDUPILOT_TOOLS="ardupilot/Tools/autotest"
APT_GET="sudo apt-get -qq --assume-yes"
# try to upgrade to g++ 4.8. See https://github.com/travis-ci/travis-ci/issues/1379
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get -qq update
sudo apt-get -qq install g++-4.8
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
$APT_GET update
$APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $AVR_PKGS
sudo pip install --upgrade pip || {
@ -50,6 +44,14 @@ done
rsync -av firmware.diydrones.com::Tools/Travis/*.deb ExtraPackages
sudo dpkg -i ExtraPackages/*.deb || echo "FAILED INSTALL OF EXTRA DEBS"
# try to upgrade to g++ 4.8. See https://github.com/travis-ci/travis-ci/issues/1379
(sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test &&
sudo apt-get -qq update &&
sudo apt-get -qq install g++-4.8 &&
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90) || {
echo "upgrade to gcc 4.8 failed"
}
if [ ! -d PX4Firmware ]; then
git clone https://github.com/diydrones/PX4Firmware.git