From a01ae49a0ba2df7f592d5f2477aa0f65849aa208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Roche?= Date: Thu, 28 Jan 2016 10:41:58 -0800 Subject: [PATCH 1/2] speed up builds by using pre-installed gcc circleci recently added 4.9 support --- circle.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index ab16a3c..d4dee64 100644 --- a/circle.yml +++ b/circle.yml @@ -1,16 +1,12 @@ machine: + pre: + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 20 environment: LOGANALYZE_DIRPATH_LOG: dronekit-la-testdata-3dr dependencies: pre: - - sudo apt-get update -y - - sudo apt-get install -y build-essential - - sudo apt-get install -y g++ - sudo apt-get install -y libjsoncpp-dev libjsoncpp0 - - sudo rm /usr/bin/g++ /usr/bin/gcc - - sudo ln -s /usr/bin/g++-4.9 /usr/bin/g++ - - sudo ln -s /usr/bin/gcc-4.9 /usr/bin/gcc - git submodule init - git submodule update From de4b6d6f4d7c6ccb41f2f54f672b9b3fd308a43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Roche?= Date: Thu, 28 Jan 2016 10:47:11 -0800 Subject: [PATCH 2/2] remove jsoncpp dep from circleci --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index d4dee64..4fd030d 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,6 @@ machine: dependencies: pre: - - sudo apt-get install -y libjsoncpp-dev libjsoncpp0 - git submodule init - git submodule update