Skip to content

Commit 1fa311c

Browse files
authored
Merge pull request #35 from plugwise/mergefix
Retry approach, skip branch checking in pre-commit
2 parents 8967019 + d5bec8c commit 1fa311c

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.github/workflows/verify.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
prepare:
2020
runs-on: ubuntu-latest
2121
name: Prepare
22-
if: github.event.pull_request.merged == false
2322
steps:
2423
- name: Check out committed code
2524
uses: actions/checkout@v2
@@ -110,7 +109,14 @@ jobs:
110109
- name: Verify commit
111110
run: |
112111
. venv/bin/activate
113-
pre-commit run --show-diff-on-failure --color=always --all-files
112+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual bandit
113+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual black
114+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual codespell
115+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual flake8
116+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual isort
117+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual mypy
118+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual userdata
119+
pre-commit run --show-diff-on-failure --color=always --all-files --hook-stage manual yamllint
114120
115121
prepare-test-cache:
116122
runs-on: ubuntu-latest

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
repos:
2+
# Run manually in CI skipping the branch checks
23
- repo: https://github.com/pre-commit/pre-commit-hooks
34
rev: v3.2.0
45
hooks:

plugwise/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Plugwise module."""
22

3-
__version__ = "0.8.2a1"
3+
__version__ = "0.8.2a2"
44

55
from plugwise.smile import Smile
66
from plugwise.stick import stick

0 commit comments

Comments
 (0)