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

Merge branch 'v2.2'

parents 44d12b9e 08aed392
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
.travis.yml
+ 3
− 3
View file @ 376bcc9a
...@@ -22,11 +22,11 @@ matrix: ...@@ -22,11 +22,11 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
env: CPPCHECK=yes CPPCHECK_VERSION=1.69 env: CPPCHECK=yes CPPCHECK_VERSION=1.71
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
env: CPPCHECK=yes CPPCHECK_VERSION=1.71 env: CPPCHECK=yes CPPCHECK_VERSION=1.74
# then check with different optimization flags # then check with different optimization flags
- os: linux - os: linux
dist: trusty dist: trusty
...@@ -50,7 +50,7 @@ matrix: ...@@ -50,7 +50,7 @@ matrix:
env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3
allow_failures: allow_failures:
# I allow this to fail temporarily # I allow this to fail temporarily
- env: CPPCHECK=yes CPPCHECK_VERSION=1.71 - env: CPPCHECK=yes CPPCHECK_VERSION=1.74
# Possible additional variables: # Possible additional variables:
# VALGRIND=yes to make valgrind tests, only when log contains string [valgrind] # VALGRIND=yes to make valgrind tests, only when log contains string [valgrind]
install: install:
......
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