From 7b1e9bf977ee2d4926853a757fe216bf011562a1 Mon Sep 17 00:00:00 2001 From: Jarrett Chisholm Date: Sun, 15 Jan 2017 22:57:09 -0500 Subject: update cmake --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8f6fb3c..028a076 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,13 @@ compiler: before_install: - sudo apt-add-repository -y ppa:jkeiren/ppa - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + - sudo add-apt-repository -y george-edison55-precise-backports - sudo apt-get update -qq - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi - if test $CC = gcc; then sudo update-alternatives --config gcc; fi - if test $CC = gcc; then sudo update-alternatives --config g++; fi + - sudo apt-get install --yes --force-yes cmake cmake-data script: ./scripts/travis.sh -- cgit v1.2.3 From cc7495e30d4a234f6e080cf4ca9ed90996be3913 Mon Sep 17 00:00:00 2001 From: Jarrett Chisholm Date: Sun, 15 Jan 2017 23:00:51 -0500 Subject: syntax error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 028a076..ff3cf7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ compiler: before_install: - sudo apt-add-repository -y ppa:jkeiren/ppa - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - sudo add-apt-repository -y george-edison55-precise-backports + - sudo add-apt-repository -y george-edison55/precise-backports - sudo apt-get update -qq - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi -- cgit v1.2.3 From e1429b611d89d35b145a808e5c6debf7d94a8584 Mon Sep 17 00:00:00 2001 From: Jarrett Chisholm Date: Sun, 15 Jan 2017 23:02:50 -0500 Subject: try different cmake ppa --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ff3cf7f..0507af9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,20 @@ language: cpp compiler: - clang - gcc +addons: + apt: + packages: + - cmake + sources: + - kalakris-cmake before_install: - sudo apt-add-repository -y ppa:jkeiren/ppa - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - sudo add-apt-repository -y george-edison55/precise-backports - sudo apt-get update -qq - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi - if test $CC = gcc; then sudo update-alternatives --config gcc; fi - if test $CC = gcc; then sudo update-alternatives --config g++; fi - - sudo apt-get install --yes --force-yes cmake cmake-data script: ./scripts/travis.sh -- cgit v1.2.3 From e31c77ebcf60a33224ff57cb598ef8178b2c59d7 Mon Sep 17 00:00:00 2001 From: Jarrett Chisholm Date: Sun, 15 Jan 2017 23:06:22 -0500 Subject: Revert "try different cmake ppa" This reverts commit e1429b611d89d35b145a808e5c6debf7d94a8584. --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 0507af9..ff3cf7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,20 +2,16 @@ language: cpp compiler: - clang - gcc -addons: - apt: - packages: - - cmake - sources: - - kalakris-cmake before_install: - sudo apt-add-repository -y ppa:jkeiren/ppa - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + - sudo add-apt-repository -y george-edison55/precise-backports - sudo apt-get update -qq - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi - if test $CC = gcc; then sudo update-alternatives --config gcc; fi - if test $CC = gcc; then sudo update-alternatives --config g++; fi + - sudo apt-get install --yes --force-yes cmake cmake-data script: ./scripts/travis.sh -- cgit v1.2.3 From c210145db55c280e909d3fc18f3f729950485b0d Mon Sep 17 00:00:00 2001 From: Jarrett Chisholm Date: Sun, 15 Jan 2017 23:07:58 -0500 Subject: syntax error fix (for real this time) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ff3cf7f..c06dba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ compiler: before_install: - sudo apt-add-repository -y ppa:jkeiren/ppa - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - sudo add-apt-repository -y george-edison55/precise-backports + - sudo add-apt-repository -y ppa:george-edison55/precise-backports - sudo apt-get update -qq - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi -- cgit v1.2.3