From 01ddbcf6946be5f4c6e5390c4ee1b46a88add9ba Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Tue, 27 Feb 2024 10:28:44 -0600
Subject: [PATCH] Improve CI

---
 .github/{dependabot.yml => dependabot.yaml}   |  0
 .github/workflows/lint.yaml                   | 46 +++++++++++++++++++
 .../workflows/{python-app.yaml => test.yaml}  | 16 +------
 .pre-commit-config.yaml                       | 12 +++++
 .vscode/settings.json                         |  1 +
 README.adoc                                   |  3 +-
 6 files changed, 62 insertions(+), 16 deletions(-)
 rename .github/{dependabot.yml => dependabot.yaml} (100%)
 create mode 100644 .github/workflows/lint.yaml
 rename .github/workflows/{python-app.yaml => test.yaml} (55%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yaml
similarity index 100%
rename from .github/dependabot.yml
rename to .github/dependabot.yaml
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 0000000..3b8b976
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,46 @@
+name: Lint
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+    branches: ["main"]
+
+permissions:
+  checks: write
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  just:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: extractions/setup-just@v1
+        with:
+          just-version: "1.24.0"
+      - name: Format justfile
+        run: just --fmt --unstable
+      - uses: reviewdog/action-suggester@v1
+        with:
+          tool_name: just
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - uses: chartboost/ruff-action@v1
+        with:
+          args: format
+      - uses: chartboost/ruff-action@v1
+        with:
+          args: check --fix
+      - uses: reviewdog/action-suggester@v1
+        with:
+          tool_name: ruff
+  yamllint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: karancode/yamllint-github-action@v2.1.1
diff --git a/.github/workflows/python-app.yaml b/.github/workflows/test.yaml
similarity index 55%
rename from .github/workflows/python-app.yaml
rename to .github/workflows/test.yaml
index ab31836..75f1b44 100644
--- a/.github/workflows/python-app.yaml
+++ b/.github/workflows/test.yaml
@@ -1,4 +1,4 @@
-name: Python application
+name: Test
 
 on:  # yamllint disable-line rule:truthy
   pull_request:
@@ -8,20 +8,6 @@ permissions:
   contents: read
 
 jobs:
-  yamllint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: karancode/yamllint-github-action@v2.1.1
-  ruff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-      - uses: chartboost/ruff-action@v1
   test:
     runs-on: ubuntu-latest
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 432193c..cc0910b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,18 @@ repos:
       - id: pretty-format-json
         exclude: ^.vscode/.*\.json$
       - id: trailing-whitespace
+  - repo: local
+    hooks:
+      - id: just
+        entry: just --fmt --unstable
+        files: |
+          (?x)^(
+            .justfile|
+            justfile
+          )$
+        language: system
+        name: just
+        pass_filenames: false
   - repo: https://github.com/jazzband/pip-tools
     rev: 7.4.0
     hooks:
diff --git a/.vscode/settings.json b/.vscode/settings.json
index be6b7a3..a6f1a0a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
         "Imager",
         "Immich",
         "inplace",
+        "justfile",
         "jwillikers",
         "keyrings",
         "kmsprint",
diff --git a/README.adoc b/README.adoc
index cdd544d..2ad0894 100644
--- a/README.adoc
+++ b/README.adoc
@@ -22,7 +22,8 @@ endif::[]
 :Rclone: https://rclone.org/[Rclone]
 :systemd: https://systemd.io/[systemd]
 
-image:https://github.com/jwillikers/detectionator/actions/workflows/python-app.yaml/badge.svg[CI, link=https://github.com/jwillikers/detectionator/actions/workflows/python-app.yaml]
+image:https://github.com/jwillikers/detectionator/actions/workflows/test.yaml/badge.svg[Tests, link=https://github.com/jwillikers/detectionator/actions/workflows/test.yaml]
+image:https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white[pre-commit, link=https://github.com/pre-commit/pre-commit]
 image:https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json[Ruff, link=https://github.com/astral-sh/ruff]
 
 A Raspberry Pi camera for taking pictures using object detection.