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(-) 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