Travis CI: trying to use Docker with Ubuntu 16.04 LTS (#1395).

opencor · Aug 11, 2017 · b4f86f6 · b4f86f6
1 parent 7d380c3
commit b4f86f6
Showing 1 changed file with 5 additions and 9 deletions.
diff --git 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