From b8cc1321ce1ddd34d5b2a4cc8fca47519f63abd8 Mon Sep 17 00:00:00 2001
From: Jackson Oursland <jacob.oursland@gmail.com>
Date: Sun, 3 Aug 2025 16:55:53 -0700
Subject: [PATCH] CI: ccache fix (#22899)

---
 .github/workflows/sub_buildPixi.yml   | 2 ++
 .github/workflows/sub_buildUbuntu.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sub_buildPixi.yml b/.github/workflows/sub_buildPixi.yml
index 056c46853a..96252cfc9f 100644
--- a/.github/workflows/sub_buildPixi.yml
+++ b/.github/workflows/sub_buildPixi.yml
@@ -54,6 +54,8 @@ jobs:
       CCACHE_MAXSIZE: 1G
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 5
+      CCACHE_DIRECT: true
+      CCACHE_NOHASHDIR: true
       config: debug
       builddir: ${{ github.workspace }}/build/debug/
       cacheKey: pixi-${{ matrix.os }}
diff --git a/.github/workflows/sub_buildUbuntu.yml b/.github/workflows/sub_buildUbuntu.yml
index 1a712da7dc..4c1d180b6e 100644
--- a/.github/workflows/sub_buildUbuntu.yml
+++ b/.github/workflows/sub_buildUbuntu.yml
@@ -211,7 +211,7 @@ jobs:
         uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ env.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
+          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
 
       - name: Upload logs
         if: always()