Skip to content
Snippets Groups Projects
Commit f0fb3893 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

fix 

goes with a5daa52d
parent a5daa52d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 7 deletions
.travis.yml
+ 7
− 7
View file @ f0fb3893
...@@ -29,25 +29,25 @@ matrix: ...@@ -29,25 +29,25 @@ matrix:
env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 LAPACK=yes env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 LAPACK=yes
# then I try serial compiler on UBUNTU precise # then I try serial compiler on UBUNTU precise
- os: linux - os: linux
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
dist: precise dist: precise
sudo: required sudo: required
env: PLUMED_CC=gcc PLUMED_CXX=g++ env: PLUMED_CC=gcc PLUMED_CXX=g++
# test using external blas with internal lapack # test using external blas with internal lapack
- os: linux - os: linux
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
dist: trusty dist: trusty
sudo: required sudo: required
env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 LAPACK=yes CONFIG_FLAGS="--disable-external-lapack" env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 LAPACK=yes CONFIG_FLAGS="--disable-external-lapack"
# test using docker image. # test using docker image.
# currently it means ubuntu 17, with gcc6 # currently it means ubuntu 17, with gcc6
- sudo: required - sudo: required
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
services: docker services: docker
env: PLUMED_DOCKER=yes env: PLUMED_DOCKER=yes
# osx serial # osx serial
- os: osx - os: osx
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
osx_image: xcode7.3 osx_image: xcode7.3
env: PLUMED_CC=clang PLUMED_CXX=clang++ PLUMED_CXXFLAGS=-O3 env: PLUMED_CC=clang PLUMED_CXX=clang++ PLUMED_CXXFLAGS=-O3
# this should not be required. I add it since it looks like with OSX it does not work otherwise # this should not be required. I add it since it looks like with OSX it does not work otherwise
...@@ -56,7 +56,7 @@ matrix: ...@@ -56,7 +56,7 @@ matrix:
- $HOME/.ccache - $HOME/.ccache
# osx parallel # osx parallel
- os: osx - os: osx
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
osx_image: xcode7.3 osx_image: xcode7.3
env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3
# this should not be required. I add it since it looks like with OSX it does not work otherwise # this should not be required. I add it since it looks like with OSX it does not work otherwise
...@@ -65,7 +65,7 @@ matrix: ...@@ -65,7 +65,7 @@ matrix:
- $HOME/.ccache - $HOME/.ccache
# osx serial macports # osx serial macports
- os: osx - os: osx
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
osx_image: xcode7.3 osx_image: xcode7.3
env: PLUMED_MACPORTS="plumed" env: PLUMED_MACPORTS="plumed"
cache: cache:
...@@ -73,7 +73,7 @@ matrix: ...@@ -73,7 +73,7 @@ matrix:
- $HOME/.macports-ci-ccache - $HOME/.macports-ci-ccache
# osx serial macports debug variant # osx serial macports debug variant
- os: osx - os: osx
if: branch =~ ^test- OR type IN pull_request if: branch =~ ^test- OR type IN(pull_request)
osx_image: xcode7.3 osx_image: xcode7.3
env: PLUMED_MACPORTS="plumed +allmodules" env: PLUMED_MACPORTS="plumed +allmodules"
cache: cache:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment