CI attemp 6 (travis)

esa · Sep 10, 2019 · e4aa2ed · e4aa2ed
1 parent a5843c3
commit e4aa2ed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
   #  sudo: required
   #  services:
   #  - docker
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="Debug"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC"
     dist: bionic
     compiler: gcc
     os: linux
@@ -35,7 +35,7 @@ matrix:
         - ubuntu-toolchain-r-test
         packages:
         - binutils-gold
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="Release"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="ReleaseGCC"
     dist: bionic
     compiler: gcc
     os: linux
@@ -45,7 +45,7 @@ matrix:
         - ubuntu-toolchain-r-test
         packages:
         - binutils-gold
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="Coverage"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="CoverageGCC"
     dist: bionic
     compiler: gcc
     os: linux
@@ -55,6 +55,16 @@ matrix:
         - ubuntu-toolchain-r-test
         packages:
         - binutils-gold
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="ReleaseClang"
+    dist: bionic
+    compiler: clang
+    os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - clang-7
   - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugClang"
     dist: bionic
     compiler: clang

diff --git a/tools/install_travis.sh b/tools/install_travis.sh
@@ -13,28 +13,24 @@ if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" != manylinux* ]]; then
     export PATH="$deps_dir/bin:$PATH"
 fi
 
-if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "ReleaseGCC48" ]]; then
+if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "ReleaseGCC" ]]; then
     CXX=g++-4.8 CC=gcc-4.8 cmake -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=yes -DCMAKE_CXX_FLAGS="-fuse-ld=gold" ../;
     make -j2 VERBOSE=1;
     ctest;
-elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "DebugGCC48" ]]; then
+elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "DebugGCC" ]]; then
     CXX=g++-4.8 CC=gcc-4.8 cmake -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Debug -DPPNF_BUILD_TESTS=yes -DCMAKE_CXX_FLAGS="-fsanitize=address -fuse-ld=gold" ../;
     make -j2 VERBOSE=1;
     ctest;
-elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "CoverageGCC5" ]]; then
+elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "CoverageGCC" ]]; then
     CXX=g++-5 CC=gcc-5 cmake -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Debug -DPPNF_BUILD_TESTS=yes -DCMAKE_CXX_FLAGS="--coverage -fuse-ld=gold" ../;
     make -j2 VERBOSE=1;
     ctest;
     bash <(curl -s https://codecov.io/bash) -x gcov-5;
-elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "DebugGCC6" ]]; then
-    CXX=g++-6 CC=gcc-6 cmake -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Debug -DPPNF_BUILD_TESTS=yes -DCMAKE_CXX_FLAGS="-fuse-ld=gold" ../;
-    make -j2 VERBOSE=1;
-    ctest;
-elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "DebugClang38" ]]; then
+elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "DebugClang" ]]; then
     CXX=clang++-3.8 CC=clang-3.8 cmake -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Debug -DPPNF_BUILD_TESTS=yes ../;
     make -j2 VERBOSE=1;
     ctest;
-elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "ReleaseClang38" ]]; then
+elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "ReleaseClang" ]]; then
     CXX=clang++-3.8 CC=clang-3.8 cmake -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=yes ../;
     make -j2 VERBOSE=1;
     ctest;