From 0ac1e8bd110598c48c31c86663a668133514964d Mon Sep 17 00:00:00 2001 From: Nicholas Sherlock Date: Sat, 28 Feb 2015 11:55:36 +1300 Subject: [PATCH 1/2] Use 4.8 series GCC compiler for Travis build tests Since 4.9 is known to create broken CC3D and Sparky builds --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26ade6fb8..749f18a4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,16 @@ env: # We use cpp for unit tests, and c for the main project. language: cpp compiler: clang -before_install: sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded && sudo apt-get update -install: sudo apt-get install build-essential gcc-arm-none-eabi git + +before_install: + - sudo apt-get update + # The PPA doesn't have a package for Trusty for 4.8, so manually download the Saucy build + - wget "http://ppa.launchpad.net/terry.guo/gcc-arm-embedded/ubuntu/pool/main/g/gcc-arm-none-eabi/gcc-arm-none-eabi_4-8-2014q2-0saucy9_amd64.deb" + +install: + - sudo apt-get install build-essential git + - sudo dpkg -i gcc-arm-none-eabi_4-8-2014q2-0saucy9_amd64.deb + before_script: arm-none-eabi-gcc --version script: ./.travis.sh From 12851f78d09dc63a4a0ef0dd5f8cfa88de44fb91 Mon Sep 17 00:00:00 2001 From: Nicholas Sherlock Date: Sun, 1 Mar 2015 14:05:20 +1300 Subject: [PATCH 2/2] Download binary version of GCC 4.8 instead of Ubuntu package --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 749f18a4f..41bab7da4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,12 @@ compiler: clang before_install: - sudo apt-get update - # The PPA doesn't have a package for Trusty for 4.8, so manually download the Saucy build - - wget "http://ppa.launchpad.net/terry.guo/gcc-arm-embedded/ubuntu/pool/main/g/gcc-arm-none-eabi/gcc-arm-none-eabi_4-8-2014q2-0saucy9_amd64.deb" + - 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" install: - - sudo apt-get install build-essential git - - sudo dpkg -i gcc-arm-none-eabi_4-8-2014q2-0saucy9_amd64.deb + - sudo apt-get install build-essential git libc6-i386 + - tar -xf gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2 + - export PATH=$PATH:$PWD/gcc-arm-none-eabi-4_8-2014q3/bin before_script: arm-none-eabi-gcc --version script: ./.travis.sh