Skip to content

Commit

Permalink
Merge branch 'develop' into set_codecov_thresholds
Browse files Browse the repository at this point in the history
  • Loading branch information
giovannipizzi authored Oct 5, 2018
2 parents ee69a3e + ca7f470 commit 37d86fc
Show file tree
Hide file tree
Showing 42 changed files with 25,962 additions and 26,455 deletions.
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- repo: git://github.com/pseewald/fprettify
sha: v0.3.3
hooks:
- id: fprettify
args: ['--indent', '2']
exclude: (?x)^(
pwscf/.*
)$
verbose: true
entry: ./test-suite/tools/fprettify-wrapper.py

17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ addons:
- openmpi-bin
- libopenmpi-dev
env:
- RUNTESTS=false RUNPRECOMMIT=true
## Use these two lines instead of the other two if you want increased output
# - W90BINARYPARALLEL=false W90VERBOSETESTS=true
# - W90BINARYPARALLEL=true W90VERBOSETESTS=true
- W90BINARYPARALLEL=false
- W90BINARYPARALLEL=true
# - RUNTESTS=true W90BINARYPARALLEL=false W90VERBOSETESTS=true
# - RUNTESTS=true W90BINARYPARALLEL=true W90VERBOSETESTS=true
- RUNTESTS=true RUNPRECOMMIT=false W90BINARYPARALLEL=false
- RUNTESTS=true RUNPRECOMMIT=false W90BINARYPARALLEL=true
install:
# Install Wannier
- ./test-suite/tools/configure_travis_compilation.sh
- make -j default w90chk2chk libs
- if [ "$RUNPRECOMMIT" == "true" ] ; then ./test-suite/install_precommit.sh ; fi
- if [ "$RUNTESTS" == "true" ] ; then ./test-suite/tools/configure_travis_compilation.sh ; fi
- if [ "$RUNTESTS" == "true" ] ; then make -j default w90chk2chk libs ; fi
script:
- ./test-suite/tools/run_tests_travis.sh
- if [ "$RUNPRECOMMIT" == "true" ] ; then ./test-suite/tools/run_precommit.sh ; fi
- if [ "$RUNTESTS" == "true" ] ; then ./test-suite/tools/run_tests_travis.sh ; fi
git:
depth: 3
after_success:
Expand Down
Loading

0 comments on commit 37d86fc

Please # to comment.