From f9fbf328c488fe5547fff14995097815f9cb6951 Mon Sep 17 00:00:00 2001
From: Nic Cope <nicc@rk0n.org>
Date: Sun, 19 Nov 2023 17:59:29 -0800
Subject: [PATCH] Use a single lint command

Signed-off-by: Nic Cope <nicc@rk0n.org>
---
 .github/workflows/ci.yml | 6 ++----
 README.md                | 5 ++---
 pyproject.toml           | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1db63dd..d92a669 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,9 +32,7 @@ jobs:
         run: pipx install hatch==1.7.0
 
       - name: Lint
-        run: |
-          hatch run lint:check-format
-          hatch run lint:check
+        run: hatch run lint:check
 
   unit-test:
     runs-on: ubuntu-22.04
@@ -77,4 +75,4 @@ jobs:
           name: module
           path: "dist/*"
           if-no-files-found: error
-          retention-days: 1
\ No newline at end of file
+          retention-days: 1
diff --git a/README.md b/README.md
index 1d5a917..00d225a 100644
--- a/README.md
+++ b/README.md
@@ -29,14 +29,13 @@ Some useful commands:
 # Generate gRPC stubs.
 hatch run generate:protoc
 
-# Lint the code, using ruff.
+# Lint the code.
 hatch run lint:check
-hatch run lint:check-format
 
 # Run unit tests.
 hatch run test:unit
 
-# Build an sdist and wheel
+# Build an sdist and wheel.
 hatch build
 ```
 
diff --git a/pyproject.toml b/pyproject.toml
index 3cf6b2b..375f7c5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,8 +53,7 @@ path = ".venv-lint"
 dependencies = ["ruff==0.1.6"]
 
 [tool.hatch.envs.lint.scripts]
-check = "ruff check crossplane tests"
-check-format = "ruff format --diff crossplane tests"
+check = "ruff check crossplane tests && ruff format --diff crossplane tests"
 
 [tool.hatch.envs.test]
 type = "virtual"