Commit fa29863f authored by Linus Pithan's avatar Linus Pithan Committed by Matias Guijarro
Browse files

Fix CI pipeline

Look at this Q/A:
https://stackoverflow.com/questions/30766270/why-use-short-circuiting-boolean-logic-rather-than-if-then-else-in-bash

(TL;DR: The use of short-circuiting logic was buggy)
parent 89a02a91
......@@ -25,8 +25,8 @@ tests:
- conda create --quiet --name testenv --channel http://bcu-ci.esrf.fr/stable --channel defaults --channel conda-forge python=3 --file requirements-conda.txt --file requirements-test-conda.txt
- source activate testenv
- pip install .
script:
- (git diff --name-only $(git merge-base HEAD origin/master) | grep -E '.py|requirements') && python setup.py test --addopts "--cov bliss --cov-report html --cov-report term" || echo "Nothing to do"
script:
- "(if ! (git diff --name-only $(git merge-base HEAD origin/master) | grep -E '.py|requirements'); then echo 'Nothing to do' ;else (python setup.py test --addopts '--cov bliss --cov-report html --cov-report term');fi)"
except:
- master
......
Supports Markdown
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