Skip to content

Commit 52f49aa

Browse files
committed
workaround new diff-coverage
1 parent 6ec7caa commit 52f49aa

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,15 @@ jobs:
337337
- name: Lint the code
338338
# pylint doesn't work on 2.6: https://bitbucket.org/logilab/pylint/issue/390/py26-compatiblity-broken
339339
if: ${{ matrix.python-version != '2.6' }}
340+
env:
341+
PYTHON_VERSION: ${{ matrix.python-version }}
340342
run: |
343+
opt=""
344+
if ! [[ $PYTHON_VERSION == 2.6 || $PYTHON_VERSION == 2.7 || $PYTHON_VERSION == 3.3 || $PYTHON_VERSION == 3.4 || $PYTHON_VERSION == 3.5 ]]; then
345+
opt="--compare-branch origin/master"
346+
fi
341347
pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" tlslite > pylint_report.txt || :
342-
diff-quality --violations=pylint --fail-under=90 pylint_report.txt
348+
diff-quality $opt --violations=pylint --fail-under=90 pylint_report.txt
343349
- name: Verify that intermediate commits are testable
344350
if: ${{ github.event.pull_request }}
345351
env:

0 commit comments

Comments
 (0)