diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | projects/scripts/travis-install.sh | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index bc9a026..cb701d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,11 @@ before_install: - sh projects/scripts/travis-install.sh install: + - export PATH=/usr/bin:$PATH - cd projects - cmake -GUnix\ Makefiles -HCMake -Bbuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX - cd build - - make -j4 + - make -j2 - cd ../.. script: diff --git a/projects/scripts/travis-install.sh b/projects/scripts/travis-install.sh index ef64661..950e8e7 100755 --- a/projects/scripts/travis-install.sh +++ b/projects/scripts/travis-install.sh @@ -15,13 +15,12 @@ if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then sudo apt-get install -qq --allow-unauthenticated --force-yes --fix-missing cmake libssl-dev if [ "$CC" = clang ]; then - sudo apt-get install -qq --allow-unauthenticated --force-yes --fix-missing clang-3.6 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 20 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 20 + sudo apt-get install -qq --allow-unauthenticated --force-yes --fix-missing clang-3.5 + sudo apt-get install --allow-unauthenticated --force-yes --fix-missing libgomp1=4.8.1-2ubuntu1~12.04 libitm1=4.8.1-2ubuntu1~12.04 libatomic1=4.8.1-2ubuntu1~12.04 libasan0=4.8.1-2ubuntu1~12.04 libtsan0=4.8.1-2ubuntu1~12.04 libquadmath0=4.8.1-2ubuntu1~12.04 libstdc++6=4.8.1-2ubuntu1~12.04 gcc-4.8-base=4.8.1-2ubuntu1~12.04 libstdc++-4.8-dev=4.8.1-2ubuntu1~12.04 cpp-4.8=4.8.1-2ubuntu1~12.04 libgcc-4.8-dev=4.8.1-2ubuntu1~12.04 fi if [ "$CC" = gcc ]; then - sudo apt-get install -qq --allow-unauthenticated --force-yes --fix-missing gcc-4.8 g++-4.8 + sudo apt-get install --allow-unauthenticated --force-yes --fix-missing libgomp1=4.8.1-2ubuntu1~12.04 libitm1=4.8.1-2ubuntu1~12.04 libatomic1=4.8.1-2ubuntu1~12.04 libasan0=4.8.1-2ubuntu1~12.04 libtsan0=4.8.1-2ubuntu1~12.04 libquadmath0=4.8.1-2ubuntu1~12.04 libstdc++6=4.8.1-2ubuntu1~12.04 gcc-4.8-base=4.8.1-2ubuntu1~12.04 libstdc++-4.8-dev=4.8.1-2ubuntu1~12.04 cpp-4.8=4.8.1-2ubuntu1~12.04 libgcc-4.8-dev=4.8.1-2ubuntu1~12.04 gcc-4.8=4.8.1-2ubuntu1~12.04 g++-4.8=4.8.1-2ubuntu1~12.04 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20 fi |