Skip to content
Snippets Groups Projects
Commit 2d61e7142693 authored by Andrew Murray's avatar Andrew Murray
Browse files

Merge pull request #4716 from hugovk/pre-commit-diff

CI: Show diff when pre-commit fails
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: pip cache - name: pip cache
uses: actions/cache@v1 uses: actions/cache@v2
with: with:
path: ~/.cache/pip path: ~/.cache/pip
key: lint-pip-${{ hashFiles('**/setup.py') }} key: lint-pip-${{ hashFiles('**/setup.py') }}
...@@ -46,4 +46,6 @@ ...@@ -46,4 +46,6 @@
- name: Lint - name: Lint
run: tox -e lint run: tox -e lint
env:
PRE_COMMIT_COLOR: always
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
multi_line_output = 3 multi_line_output = 3
[tool:pytest] [tool:pytest]
addopts = -ra addopts = -ra --color=yes
testpaths = Tests testpaths = Tests
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
[testenv:lint] [testenv:lint]
commands = commands =
pre-commit run --all-files pre-commit run --all-files --show-diff-on-failure
check-manifest check-manifest
deps = deps =
pre-commit pre-commit
check-manifest check-manifest
skip_install = true skip_install = true
...@@ -28,5 +28,6 @@ ...@@ -28,5 +28,6 @@
check-manifest check-manifest
deps = deps =
pre-commit pre-commit
check-manifest check-manifest
skip_install = true skip_install = true
passenv = PRE_COMMIT_COLOR
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment