From 695e05c71306032c7915554843eb52cedf83457f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 30 Jan 2016 00:36:32 +0100 Subject: [PATCH] Try to update gcc-avr on Travis and fix compilation failure --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f1c3369b..aab754142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,12 @@ before_install: - sudo apt-get remove cmake cmake-data --yes - sudo add-apt-repository ppa:george-edison55/precise-backports --yes - sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes - - sudo add-apt-repository ppa:nonolith/avr-toolchain --yes - sudo apt-get update - rsync -av firmware.diydrones.com::Tools/Travis/*.deb ExtraPackages - - sudo dpkg -i ExtraPackages/*.deb || echo "FAILED INSTALL OF EXTRA DEBS" install: - - sudo apt-get install -y xvfb lcov cmake cmake-data bc curl gcc-arm-none-eabi atmel-toolchain-binutils-avr atmel-toolchain-gcc-avr atmel-toolchain-avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev + - sudo apt-get install -y xvfb lcov cmake cmake-data bc curl gcc-arm-none-eabi libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev + - sudo dpkg -i ExtraPackages/*.deb || echo "FAILED INSTALL OF EXTRA DEBS" script: - radio/util/commit-tests.sh