From 8d04169a4de2a21190e8efcc1d0720f32364fa5e Mon Sep 17 00:00:00 2001
From: David Vo <auscompgeek@users.noreply.github.com>
Date: Wed, 1 Jan 2025 15:30:28 +1100
Subject: [PATCH 1/2] ci: Use sccache on Windows again

This partially reverts 2bc87c0dcc197b31102bae41c27d21f154f60045.
---
 .github/workflows/dist.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index a680c1cba..512029e03 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -88,24 +88,29 @@ jobs:
     # Setup build caching
     #
 
-    - name: Set ccache size
+    - name: Set ccache params
       shell: bash
       id: ccache
       run: |
         if [[ "${{ runner.os }}" == "Windows" ]]; then
-          echo "MAX_SIZE=1200M" >> $GITHUB_OUTPUT
+          echo "VARIANT=sccache" >> $GITHUB_OUTPUT
         else
+          echo "VARIANT=ccache" >> $GITHUB_OUTPUT
           echo "MAX_SIZE=500M" >> $GITHUB_OUTPUT
         fi
 
     - name: Setup ccache
-      # uses: hendrikmuhs/ccache-action@v1.2.10
-      uses: robotpy/ccache-action@fork
+      if: steps.ccache.outputs.variant == 'ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
       with:
           key: ${{ matrix.os }}-${{ matrix.python_version }}
           variant: ccache
           max-size: ${{ steps.ccache.outputs.max_size }}
 
+    - name: Setup sccache
+      if: steps.ccache.outputs.variant == 'sccache'
+      uses: mozilla-actions/sccache-action@v0.0.7
+
     - name: Install deps
       shell: bash
       run: |
@@ -122,7 +127,7 @@ jobs:
         ./rdev.sh ci run
       env:
         RPYBUILD_STRIP_LIBPYTHON: "1"
-        RPYBUILD_CC_LAUNCHER: ccache
+        RPYBUILD_CC_LAUNCHER: ${{ steps.ccache.outputs.variant }}
 
     - uses: actions/upload-artifact@v4
       with:

From ba4ba60073ab5e4b731f4fdff718ba988ebed3e1 Mon Sep 17 00:00:00 2001
From: David Vo <auscompgeek@users.noreply.github.com>
Date: Wed, 1 Jan 2025 15:32:24 +1100
Subject: [PATCH 2/2] ci: Use Artifactory as sccache storage

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

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 512029e03..746ab1265 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -14,6 +14,10 @@ concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  SCCACHE_WEBDAV_ENDPOINT: "https://frcmaven.wpi.edu/artifactory/wpilib-generic-cache-cmake-local"
+  SCCACHE_WEBDAV_KEY_PREFIX: "sccache-robotpy"
+
 jobs:
   # This job limits concurrency on the default branch
   # - we want it to run so it can populate ccache, but we typically
@@ -128,6 +132,8 @@ jobs:
       env:
         RPYBUILD_STRIP_LIBPYTHON: "1"
         RPYBUILD_CC_LAUNCHER: ${{ steps.ccache.outputs.variant }}
+        SCCACHE_WEBDAV_USERNAME: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
+        SCCACHE_WEBDAV_PASSWORD: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
 
     - uses: actions/upload-artifact@v4
       with: