From 1315ed7ddfb1e8f0704da47abf733195adfa07a1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 5 Apr 2015 09:43:57 -0700 Subject: [PATCH] Travis: allow upgrade to gcc 4.8 to fail --- Tools/scripts/install-travis-env.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Tools/scripts/install-travis-env.sh b/Tools/scripts/install-travis-env.sh index 456e093f02..4188e0d8b2 100755 --- a/Tools/scripts/install-travis-env.sh +++ b/Tools/scripts/install-travis-env.sh @@ -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