Skip to content

Commit

Permalink
update travis for new build
Browse files Browse the repository at this point in the history
  • Loading branch information
sytelus committed Jul 30, 2017
1 parent 6a89548 commit a242b53
Showing 1 changed file with 4 additions and 20 deletions.
24 changes: 4 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ matrix:
env:
- TOOL="cmake"
- DESCRIPTION="OS X build/test via CMake"
- EIGEN_ROOT="/usr/local/Cellar/eigen/3.3.3"
- EIGEN3_INCLUDE_DIR="/usr/local/Cellar/eigen/3.3.3/include/eigen3"

# docker exec xenial apt-get -y install clang libclang-3.8-dev;
install:
Expand All @@ -41,24 +39,8 @@ install:
docker exec xenial apt-get -y upgrade;
docker exec xenial apt-get -y install git wget unzip;
docker exec xenial apt-get -y install build-essential software-properties-common cmake;
docker exec xenial wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -;
docker exec xenial apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main";
docker exec xenial apt-get update;
docker exec xenial apt-get -y --allow-unauthenticated install clang-3.9 lldb-3.9;
docker exec xenial update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.9 60 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-3.9;
docker exec xenial wget https://launchpad.net/ubuntu/+source/libc++/3.9.1-2/+build/11842034/+files/libc++-dev_3.9.1-2_amd64.deb;
docker exec xenial dpkg -i libc++-dev_3.9.1-2_amd64.deb;
docker exec xenial wget https://launchpad.net/ubuntu/+source/libc++/3.9.1-2/+build/11842034/+files/libc++-helpers_3.9.1-2_all.deb;
docker exec xenial dpkg -i libc++-helpers_3.9.1-2_all.deb;
docker exec xenial wget https://launchpad.net/ubuntu/+source/libc++/3.9.1-2/+build/11842034/+files/libc++1_3.9.1-2_amd64.deb;
docker exec xenial dpkg -i libc++1_3.9.1-2_amd64.deb;
docker exec xenial wget https://launchpad.net/ubuntu/+source/libc++/3.9.1-2/+build/11842034/+files/libc++abi1_3.9.1-2_amd64.deb;
docker exec xenial dpkg -i libc++abi1_3.9.1-2_amd64.deb;
docker exec xenial wget https://launchpad.net/ubuntu/+source/libc++/3.9.1-2/+build/11842034/+files/libc++abi-dev_3.9.1-2_amd64.deb;
docker exec xenial dpkg -i libc++abi-dev_3.9.1-2_amd64.deb;

elif [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TOOL" == "cmake" ]]; then
echo "No install osx actions--using repo eigen";
echo "No install osx actions--using repo";
fi

before_install:
Expand All @@ -70,9 +52,11 @@ before_install:

#docker exec xenial /bin/sh -c "export EIGEN3_INCLUDE_DIR=/build/eigen/eigen3 && cd /build/cmake && sh ./build.sh && cmake . && make";
script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
docker exec -t --privileged xenial /build/setup.sh;
docker exec -t --privileged xenial /build/build.sh;
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
git submodule update --init --recursive;
./setup.sh;
./build.sh;
fi

0 comments on commit a242b53

Please sign in to comment.