aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAntony Woods <acron1@gmail.com>2013-10-31 09:01:02 +0000
committerAntony Woods <acron1@gmail.com>2013-10-31 09:01:02 +0000
commit9119c560108b4640e4e55e91d9066ec59d23e251 (patch)
treed3adc1dd6a657cf4604639a0ec0696b528e3b4bd /.travis.yml
parent30c394088d733ccf5b1a40787e15bb6b2dcd0164 (diff)
Line endings fix?
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml36
1 files changed, 18 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index 8331cdf..611553a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,18 @@
-language: cpp
-compiler:
- - clang
- - gcc
-env:
- - USE_STD_SHARED_PTR=1
- - USE_STD_SHARED_PTR=0
-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 apt-get update -qq
- - if test $CC = gcc; then sudo apt-get install 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
-
-script: ./scripts/travis.sh
+language: cpp
+compiler:
+ - clang
+ - gcc
+env:
+ - USE_STD_SHARED_PTR=1
+ - USE_STD_SHARED_PTR=0
+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 apt-get update -qq
+ - if test $CC = gcc; then sudo apt-get install 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
+
+script: ./scripts/travis.sh