From 8f8e09ac95faf674ae83eabb5cd8affc259d0340 Mon Sep 17 00:00:00 2001
From: mpenning <mike@pennington.net>
Date: Thu, 19 Oct 2023 19:25:21 -0500
Subject: [PATCH] Modify test matrix

---
 .github/workflows/tests.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 64d228f1..744dc24d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,11 +5,13 @@
 # Thanks to Pallets/flask for a useful test.yaml template...
 #     https://github.com/pallets/flask/blob/main/.github/workflows/tests.yaml
 #
+
 name: Tests
 on:
   push:
     branches:
       - main
+      - '*.x'
     paths-ignore:
       - 'docs/**'
       - '*.md'
@@ -22,9 +24,6 @@ on:
       - 'docs/**'
       - '*.md'
       - '*.rst'
-  schedule:
-    # Schedule test runs at 3:42 UTC every Saturday
-    - cron: "42 3 * * 6"
 jobs:
   tests:
     name: ${{ matrix.name }}
@@ -41,24 +40,21 @@ jobs:
           - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
           - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
           - {name: 'PyPy', python: 'pypy-3.10', os: ubuntu-latest, tox: pypy310}
-          - {name: 'Minimum Versions', python: '3.11', os: ubuntu-latest, tox: py311}
-          - {name: 'Development Versions', python: '3.8', os: ubuntu-latest, tox: py38}
+          - {name: 'Minimum Versions', python: '3.11', os: ubuntu-latest, tox: py311-min}
+          - {name: 'Development Versions', python: '3.8', os: ubuntu-latest, tox: py38-dev}
+          - {name: Typing, python: '3.11', os: ubuntu-latest, tox: typing}
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
       - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
         with:
           python-version: ${{ matrix.python }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/*.txt'
+      - name: cache mypy
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+        with:
+          path: ./.mypy_cache
+          key: mypy|${{ matrix.python }}|${{ hashFiles('pyproject.toml') }}
+        if: matrix.tox == 'typing'
       - run: pip install tox
       - run: tox run -e ${{ matrix.tox }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-env:
-    PY_COLORS: 1
-    FORCE_COLOR: 1
-