From 17bd16743163cca9ab7dc0b616a0efb8be8231d3 Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Fri, 18 Oct 2024 09:15:51 +0100
Subject: [PATCH] Tweak ci (#9)

---
 .github/workflows/ci.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4d92ca7d..9e9bf9c8c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,14 +21,14 @@ jobs:
         with:
           enable-cache: true
 
-      - run: uv python install 3.12
-
       - name: Install dependencies
         run: uv sync --python 3.12 --frozen
 
-      - run: make lint
-      - run: make typecheck
-      - run: make typecheck-mypy
+      - uses: pre-commit/action@v3.0.0
+        with:
+          extra_args: --all-files --verbose
+        env:
+          SKIP: no-commit-to-branch
 
   test:
     name: test on ${{ matrix.python-version }}
@@ -46,13 +46,8 @@ jobs:
         with:
           enable-cache: true
 
-      - name: Set up Python ${{ matrix.python-version }}
-        run: uv python install ${{ matrix.python-version }}
-
-      - run: uv sync --python ${{ matrix.python-version }} --upgrade
-
       - run: mkdir coverage
-      - run: make test
+      - run: uv run --frozen --python ${{ matrix.python-version }} coverage run -m pytest
         env:
           COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
       - name: store coverage files
@@ -84,7 +79,7 @@ jobs:
 #        with:
 #          token: ${{ secrets.CODECOV_TOKEN }}
 #          file: ./coverage.xml
-      - run: uv run --frozen coverage report --fail-under 70
+      - run: uv run --frozen coverage report --fail-under 90
 
   # https://github.com/marketplace/actions/alls-green#why used for branch protection checks
   check:
@@ -113,8 +108,6 @@ jobs:
         with:
           enable-cache: true
 
-      - run: uv python install 3.12
-
       - name: check GITHUB_REF matches package version
         uses: samuelcolvin/check-python-version@v4.1
         with: