try with cxx compiler

esa · Apr 16, 2020 · 3df49e1 · 3df49e1
1 parent 86b7214
commit 3df49e1
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 79 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,83 +9,82 @@ env:
 
 matrix:
   include:
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py38" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py37" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py36" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC"
-      dist: bionic
-      compiler: gcc
-      os: linux
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-          packages:
-          - binutils-gold
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="ReleaseGCC"
-      dist: bionic
-      compiler: gcc
-      os: linux
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-          packages:
-          - binutils-gold
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="CoverageGCC"
-      dist: bionic
-      compiler: gcc
-      os: linux
-      addons:
-        apt:
-          sources:
-          - 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
-      os: linux
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-          packages:
-          - clang-7
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="Python37"
-      dist: bionic
-      compiler: gcc
-      os: linux
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXDebug"
-      os: osx
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXRelease"
-      os: osx
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py38" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
+    #  sudo: required
+    #  services:
+    #  - docker
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py37" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
+    #  sudo: required
+    #  services:
+    #  - docker
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py36" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
+    #  sudo: required
+    #  services:
+    #  - docker
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC"
+    #  dist: bionic
+    #  compiler: gcc
+    #  os: linux
+    #  addons:
+    #    apt:
+    #      sources:
+    #      - ubuntu-toolchain-r-test
+    #      packages:
+    #      - binutils-gold
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="ReleaseGCC"
+    #  dist: bionic
+    #  compiler: gcc
+    #  os: linux
+    #  addons:
+    #    apt:
+    #      sources:
+    #      - ubuntu-toolchain-r-test
+    #      packages:
+    #      - binutils-gold
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="CoverageGCC"
+    #  dist: bionic
+    #  compiler: gcc
+    #  os: linux
+    #  addons:
+    #    apt:
+    #      sources:
+    #      - 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
+    #  os: linux
+    #  addons:
+    #    apt:
+    #      sources:
+    #      - ubuntu-toolchain-r-test
+    #      packages:
+    #      - clang-7
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="Python37"
+    #  dist: bionic
+    #  compiler: gcc
+    #  os: linux
+    #  addons:
+    #    apt:
+    #      sources:
+    #      - ubuntu-toolchain-r-test
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXDebug"
+    #  os: osx
+    #- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXRelease"
+    #  os: osx
     - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXPython37"
       os: osx
-      osx_image: xcode6.4
 script:
 - mkdir build
 - cd build

diff --git a/tools/install_deps.sh b/tools/install_deps.sh
@@ -19,16 +19,16 @@ if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" != manylinux* ]]; then
     conda config --add channels conda-forge --force
 
     # All builds will need these
-    conda_pkgs="boost>=1.56 cmake>=3.2 pagmo-devel>=2.0"
+    conda_pkgs="boost>=1.56 cmake>=3.2 pagmo-devel>=2.0 cxx-compiler"
 
     # Only Python builds will need these
     if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == "Python37" || "${PAGMO_PLUGINS_NONFREE_BUILD}" == "OSXPython37" ]]; then
         conda_pkgs="$conda_pkgs python=3.7 pygmo>=2.0 pybind11" 
     fi
 
-    if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == OSX* ]]; then
-        conda_pkgs="$conda_pkgs clangdev<10"
-    fi
+    #if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == OSX* ]]; then
+    #    conda_pkgs="$conda_pkgs clangdev<10"
+    #fi
 
     if [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == Python* ]]; then
         conda_pkgs="$conda_pkgs graphviz doxygen sphinx breathe"