Merge pull request #163 from SylvainCorlay/use-conda-gcc

Use conda's gcc for CI
jupyter-xeus · Feb 2, 2019 · 97137b5 · 97137b5
2 parents ae06309 + e51bc9e
commit 97137b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -34,7 +34,10 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq==4.3.0 xproperty==0.8.1 xtl==0.5.3 -c QuantStack -c conda-forge
+  # Install host dependencies
+  - conda install xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.4.0 -c conda-forge
+  # Install build dependencies
+  - conda install gtest cmake -c conda-forge
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
   - nmake test_xwidgets
   - cd test

diff --git a/.travis.yml b/.travis.yml
@@ -17,11 +17,19 @@ install:
     - hash -r
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
-    - conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq=4.3.0 xproperty=0.8.1 xtl=0.5.3 gcc-7 -c QuantStack -c conda-forge
+    # Install host dependencies
+    - conda install xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.4.0 -c conda-forge
+    # Install build dependencies
+    - conda install cmake -c conda-forge
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        conda install gxx_linux-64 -c conda-forge;
+      fi
+    # Activate root environment
+    - source activate root
     # Testing
     - mkdir build
     - cd build
-    - cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ -D DOWNLOAD_GTEST=ON ..
+    - cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ -D DOWNLOAD_GTEST=ON -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX ..
     - make -j2 install
     - cd test
 script: