diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb1b8a4..babd920 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,25 +8,25 @@ repos: stages: [commit-msg] pass_filenames: true - - id: ruff-lint + - id: lint-ruff name: ruff lint - entry: .venv/bin/ruff check src/ tests/ + entry: make lint-ruff language: system types: [python] pass_filenames: false stages: [pre-commit] - - id: ruff-format + - id: lint-format name: ruff format check - entry: .venv/bin/ruff format --check src/ tests/ + entry: make lint-format language: system types: [python] pass_filenames: false stages: [pre-commit] - - id: pyright + - id: typecheck name: pyright type check - entry: .venv/bin/pyright + entry: make typecheck language: system types: [python] pass_filenames: false @@ -34,7 +34,7 @@ repos: - id: ansible-lint name: ansible-lint - entry: .venv/bin/ansible-lint ansible/ + entry: make ansible-lint language: system types: [yaml] pass_filenames: false @@ -42,7 +42,7 @@ repos: - id: pytest-cov name: pytest with 100% coverage - entry: .venv/bin/pytest tests/unit/ --cov=src/gitea_runner_manager --cov=scripts --cov-report=term-missing --cov-fail-under=100 + entry: make pytest-cov language: system types: [python] pass_filenames: false diff --git a/Makefile b/Makefile index 79c1754..a0b91c5 100644 --- a/Makefile +++ b/Makefile @@ -74,11 +74,17 @@ remove: @if [ -z "$(HOST)" ]; then echo "HOST is required. Example: make remove HOST=192.168.1.10"; exit 1; fi $(BIN)/grm remove $(HOST) $(if $(USER),--user $(USER),) $(if $(NAME),--name $(NAME),) $(if $(TOKEN),--token $(TOKEN),) $(if $(MODE),--mode $(MODE),) $(if $(ASK_BECOME_PASS),--ask-become-pass,) -lint: +lint-ruff: $(BIN)/ruff check src/ tests/ + +lint-format: $(BIN)/ruff format --check src/ tests/ + +typecheck: $(BIN)/pyright +lint: lint-ruff lint-format typecheck + ansible-lint: $(BIN)/ansible-lint ansible/ @@ -94,7 +100,7 @@ test-integration: $(BIN)/pytest tests/integration/ -v --no-cov pytest-cov: - $(BIN)/pytest tests/unit/ -v --cov=src/gitea_runner_manager --cov-report=term-missing --cov-fail-under=100 + $(BIN)/pytest tests/unit/ -v --cov=src/gitea_runner_manager --cov=scripts --cov-report=term-missing --cov-fail-under=100 MOLECULE := $(realpath $(BIN))/molecule MOLECULE_BASE := cd $(CURDIR)/ansible/roles/gitea-runner && ANSIBLE_ALLOW_BROKEN_CONDITIONALS=true $(MOLECULE)