From 117add02834d15788efd0023c10e16c1b5249bd2 Mon Sep 17 00:00:00 2001
From: David Vo <auscompgeek@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:33:59 +1100
Subject: [PATCH 1/3] Fix black excludes

The regex was broken.

https://black.readthedocs.io/en/stable/usage_and_configuration/file_collection_and_discovery.html#gitignore
---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 7e8ac5b8..bfe36809 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,5 +9,4 @@ write_to = "robotpy_build/version.py"
 target-version = ['py38']
 extend-exclude = '''
 ^/robotpy_build/pybind11
-^/robotpy_build/version.py
 '''

From 44ded4311a23a1292c08928e0166a12c47ac5999 Mon Sep 17 00:00:00 2001
From: Spicuzza <dustin@virtualroadside.com>
Date: Sat, 24 Aug 2024 23:57:05 -0400
Subject: [PATCH 2/3] Update to latest ccache

---
 .github/workflows/dist.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index c359c336..a35c5810 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -119,21 +119,11 @@ jobs:
         name: dist
         path: dist
 
-    - name: Set ccache variant
-      shell: bash
-      id: ccache
-      run: |
-        if [[ "${{ matrix.os }}" == windows-* ]]; then
-          echo "VARIANT=sccache" >> $GITHUB_OUTPUT
-        else
-          echo "VARIANT=ccache" >> $GITHUB_OUTPUT
-        fi
-
     - name: Setup ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      uses: robotpy/ccache-action@fork
       with:
           key: ${{ matrix.os }}-${{ matrix.architecture }}-${{ matrix.python_version }}
-          variant: ${{ steps.ccache.outputs.variant }}
+          variant: ccache
 
     - name: Install
       shell: bash
@@ -150,7 +140,7 @@ jobs:
       env:
         RPYBUILD_PARALLEL: 1
         RPYBUILD_STRIP_LIBPYTHON: 1
-        RPYBUILD_CC_LAUNCHER: ${{ steps.ccache.outputs.variant }}
+        RPYBUILD_CC_LAUNCHER: ccache
       working-directory: tests
       run: |
         python run_tests.py
@@ -176,7 +166,7 @@ jobs:
 
     - run: apt-get update
     - name: Setup ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      uses: robotpy/ccache-action@fork
       with:
           key: ${{ matrix.container }}
 

From 2bfae4e4eba4825889994d41d3eed798fc2d3be7 Mon Sep 17 00:00:00 2001
From: Spicuzza <dustin@virtualroadside.com>
Date: Sat, 24 Aug 2024 23:59:54 -0400
Subject: [PATCH 3/3] Update matrix

---
 .github/workflows/dist.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index a35c5810..343d8bf4 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -89,7 +89,7 @@ jobs:
     strategy:
       max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-20.04]
+        os: ["ubuntu-22.04", "macos-12", "windows-2022"]
         python_version:
         - '3.8'
         - '3.9'
@@ -98,9 +98,9 @@ jobs:
         - '3.12'
         architecture: [x86, x64]
         exclude:
-        - os: macos-latest
+        - os: macos-12
           architecture: x86
-        - os: ubuntu-20.04
+        - os: ubuntu-22.04
           architecture: x86
 
     steps: