From b4f86f64cf91cfaa2b0ab35225e711fd76ec3e84 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 11 Aug 2017 21:09:16 +0200 Subject: [PATCH] Travis CI: trying to use Docker with Ubuntu 16.04 LTS (#1395). --- scripts/travisciscript | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/scripts/travisciscript b/scripts/travisciscript index c0f429400f..4f1b72491c 100755 --- a/scripts/travisciscript +++ b/scripts/travisciscript @@ -33,20 +33,16 @@ if [ "${TRAVIS_OS_NAME}" = "linux" ]; then fi docker exec -ti travis-ci bash -c "export CONFIG=${CONFIG}; \ - export CXX=g++; \ export CC=gcc; \ - cd opencor; \ - ls -al; \ - ls -al scripts; \ - cd build; \ + export CXX=g++; \ + g++ --version; \ + cd opencor/build; \ cmake -G Ninja -DCMAKE_BUILD_TYPE=$CONFIG -DENABLE_TRAVIS_CI=ON -DCMAKE_PREFIX_PATH=/opt/qt56/lib/cmake -DENABLE_SAMPLE_PLUGINS=ON -DENABLE_TEST_PLUGINS=ON -DENABLE_TESTS=ON ..; \ ninja; \ - cd ..; \ - build/bin/runtests" + bin/runtests" else cd build cmake -G Ninja -DCMAKE_BUILD_TYPE=$CONFIG -DENABLE_TRAVIS_CI=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake -DENABLE_SAMPLE_PLUGINS=ON -DENABLE_TEST_PLUGINS=ON -DENABLE_TESTS=ON .. ninja - cd .. - build/OpenCOR.app/Contents/MacOS/runtests + OpenCOR.app/Contents/MacOS/runtests fi