Skip to content

Commit

Permalink
Merge remote-tracking branch 'neofaunus/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mlund committed Oct 16, 2018
2 parents 1116732 + 5fcabe0 commit d92092c
Show file tree
Hide file tree
Showing 80 changed files with 24,633 additions and 0 deletions.
58 changes: 58 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Faunus
faunus
faunus_sphere
faunus_nopbc
tests
include/
3rdparty/
examples/

# CMake
CMakeCache.txt
CMakeFiles
Makefile
cmake_install.cmake
install_manifest.txt
DartConfiguration.tcl
Testing
CTestTestfile.cmake
.ipynb_checkpoints/
.swp

# Compiled Object files
*.slo
*.lo
*.o

*.dsym

# Compiled Dynamic libraries
*.so
*.dylib

# Compiled Static libraries
*.lai
*.la
*.a

# VIM backup files
*~

# Doxygen
doxyhtml

# Kdevelop
*.kdev4

# MacOS X generated files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db

/.idea/
#!/.idea/codeStyleSettings.xml
55 changes: 55 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
language: cpp
dist: trusty
sudo: required
group: edge
compiler: clang

matrix:
include:

# OSX / Clang
- os: osx
osx_image: xcode9.2
env: [COMPILER=clang++, CXX=clang++, CC=clang]

# Linux / Clang
- os: linux
env: [COMPILER=clang++-5.0, CXX=clang++, CC=clang]
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
packages: ['g++-7', 'clang-5.0']

install:
- |
# conda
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
hash -r
conda config --set always_yes yes --set changeps1 no
conda config --add channels conda-forge
conda update -q conda
conda install conda-build=2 anaconda-client
conda update -q conda-build
script:
- |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
#conda install cmake openmpi=1.6.3 python=3
# CXX=clang++ CC=clang cmake . -DENABLE_MPI=on
# make faunus
# make tests
# make test
cd scripts/
conda config --set anaconda_upload yes
conda-build --user teokem --token "${CONDA_UPLOAD_TOKEN}" .
else
cd scripts/
conda config --set anaconda_upload yes
conda-build --user teokem --token "${CONDA_UPLOAD_TOKEN}" .
fi
Loading

0 comments on commit d92092c

Please sign in to comment.