From 234bf1a34b81a65712ed3d5d8346661e524861d0 Mon Sep 17 00:00:00 2001 From: Alex Mason Date: Thu, 22 Dec 2016 21:30:46 +1100 Subject: [PATCH 1/6] Try ubuntu trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6c179e7..9d7c154 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: c++ +dist: trusty install: - sudo add-apt-repository ppa:george-edison55/cmake-3.x --yes - sudo apt-get update -qq From c556fbd531cf8ef9a209e096a95f9d5a49a77422 Mon Sep 17 00:00:00 2001 From: Alex Mason Date: Thu, 22 Dec 2016 21:36:00 +1100 Subject: [PATCH 2/6] Parallel build? --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d7c154..9de1cb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,4 @@ script: - mkdir build - cd build - cmake .. - - make - - make test + - make -j && make test From 7ca9c47d70053d2633385c0b7a51a5b8098f4350 Mon Sep 17 00:00:00 2001 From: Alex Mason Date: Thu, 22 Dec 2016 21:43:45 +1100 Subject: [PATCH 3/6] sudo: required = more RAM? parallel = bad --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9de1cb9..e799f30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: c++ dist: trusty +sudo: required install: - sudo add-apt-repository ppa:george-edison55/cmake-3.x --yes - sudo apt-get update -qq @@ -8,4 +9,4 @@ script: - mkdir build - cd build - cmake .. - - make -j && make test + - make && make test From 12f291438485d3ef0db09a9093dd8a0ec6182286 Mon Sep 17 00:00:00 2001 From: Alex Mason Date: Fri, 23 Dec 2016 12:59:45 +1100 Subject: [PATCH 4/6] See if we can get a newer boost --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e799f30..6a8883f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ dist: trusty sudo: required install: - sudo add-apt-repository ppa:george-edison55/cmake-3.x --yes + - sudo add-apt-repository ppa:ostogvin/tjo-develop --yes - sudo apt-get update -qq - - sudo apt-get install g++ cmake libboost-all-dev pandoc zlib1g-dev libbz2-dev libsqlite3-dev + - sudo apt-get install g++ cmake boost libboost-all-dev pandoc zlib1g-dev libbz2-dev libsqlite3-dev script: - mkdir build - cd build From 9efc598666f115a81aed41b2d162e02eab5ff0ee Mon Sep 17 00:00:00 2001 From: Alex Mason Date: Fri, 23 Dec 2016 13:01:45 +1100 Subject: [PATCH 5/6] Oops --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a8883f..e861593 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - sudo add-apt-repository ppa:george-edison55/cmake-3.x --yes - sudo add-apt-repository ppa:ostogvin/tjo-develop --yes - sudo apt-get update -qq - - sudo apt-get install g++ cmake boost libboost-all-dev pandoc zlib1g-dev libbz2-dev libsqlite3-dev + - sudo apt-get install g++ cmake libboost-all-dev pandoc zlib1g-dev libbz2-dev libsqlite3-dev script: - mkdir build - cd build From bd9c4b4eb26e11889634bbc9f5d7a86566cc8f6e Mon Sep 17 00:00:00 2001 From: Alex Mason Date: Fri, 23 Dec 2016 13:07:12 +1100 Subject: [PATCH 6/6] And again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e861593..a0845f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: trusty sudo: required install: - sudo add-apt-repository ppa:george-edison55/cmake-3.x --yes - - sudo add-apt-repository ppa:ostogvin/tjo-develop --yes + - sudo add-apt-repository ppa:boost-latest/ppa --yes - sudo apt-get update -qq - sudo apt-get install g++ cmake libboost-all-dev pandoc zlib1g-dev libbz2-dev libsqlite3-dev script: