Skip to content
Snippets Groups Projects
Commit 134c045d authored by jlaura's avatar jlaura Committed by Makayla Shepherd
Browse files

Fixes upload to anaconda cloud (#76)

* Updates travis

* turns off failing test

* Travis not pulling g++6

* Adds travis deploy

* Updates CMake builds to optionally build CSM

* No need to specify py verison - no py

* Testing PATHS for conda build

* build from root

* trying cmake paths in quotes for travis

* Loacal tests passing, not trying my fork

* Updates meta.yaml to point back to upstream

* Erroneous option for building tests
parent 56331e94
No related branches found
No related tags found
No related merge requests found
...@@ -41,9 +41,9 @@ script: ...@@ -41,9 +41,9 @@ script:
- cmake -DCOVERAGE=ON .. - cmake -DCOVERAGE=ON ..
- cmake --build . - cmake --build .
- ctest - ctest
- cd ..
after_success: after_success:
- cd .. && source activate base
- conda install -y -q conda-build anaconda-client - conda install -y -q conda-build anaconda-client
# Pull the libcsm for the build from our anaconda channel # Pull the libcsm for the build from our anaconda channel
- conda config --add channels usgs-astrogeology - conda config --add channels usgs-astrogeology
......
...@@ -64,9 +64,10 @@ else() ...@@ -64,9 +64,10 @@ else()
endif() endif()
# Optional build or link against CSM
option (BUILD_TESTS "Build tests" ON)
if(BUILD_TESTS)
include(CTest) include(CTest)
enable_testing() enable_testing()
add_subdirectory(tests) add_subdirectory(tests)
endif()
#!/bin/sh #!/bin/sh
source activate base
mkdir build && cd build mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_CSM=OFF .. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_CSM=OFF -DBUILD_TESTS=OFF ..
make install make install
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment