Merge branch 'master' into r0.8

This commit is contained in:
Reuben Morais 2020-05-26 12:56:57 +02:00
commit b4bf745d13

View File

@ -12,11 +12,14 @@ jobs:
- name: cardboard linter - name: cardboard linter
install: install:
- pip install --upgrade cardboardlint pylint - pip install --upgrade cardboardlint pylint
script: script: |
# Run cardboardlinter, in case of pull requests # Run cardboardlinter, in case of pull requests
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
cardboardlinter --refspec $TRAVIS_BRANCH -n auto; if [ "$TRAVIS_BRANCH" != "master" ]; then
git fetch origin $TRAVIS_BRANCH:$TRAVIS_BRANCH
fi fi
cardboardlinter --refspec $TRAVIS_BRANCH -n auto;
fi
- name: python unit tests - name: python unit tests
install: install:
- pip install --upgrade -r requirements_tests.txt; - pip install --upgrade -r requirements_tests.txt;