From ffa9f79f941e1e58f591f9d45d715e7114c40a50 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 29 Apr 2023 22:30:42 -0700
Subject: [PATCH] rightsize ccache, protect steam sdk from eviction

---
 .github/workflows/build.yml | 8 ++++++++
 .github/workflows/steam.yml | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f03d8b3b0..39be29f9c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,6 +72,12 @@ jobs:
           #    - name: Download DF
           #      run: |
           #        sh ci/download-df.sh
+    - name: Restore steam SDK
+      uses: actions/cache@v3
+      with:
+        path: depends/steam
+        key: steam-sdk-156
+        enableCrossOsArchive: true
     - name: Configure DFHack
       env:
         CC: gcc-${{ matrix.gcc }}
@@ -94,6 +100,8 @@ jobs:
     - name: Build DFHack
       run: |
         ninja -C build-ci install
+        ccache --max-size 100M
+        ccache --cleanup
         ccache --show-stats
     - name: Run cpp unit tests
       id: run_tests_cpp
diff --git a/.github/workflows/steam.yml b/.github/workflows/steam.yml
index 33aa16d34..4c275e032 100644
--- a/.github/workflows/steam.yml
+++ b/.github/workflows/steam.yml
@@ -14,8 +14,8 @@ on:
       release_channel:
         description: Release channel
         type: string
-        required: false
-        default: beta
+        required: true
+        default: staging
 
 jobs:
   deploy-to-steam:
@@ -34,12 +34,12 @@ jobs:
           path: build/win64-cross/ccache
           key: ccache-win64-cross-msvc-${{ github.event.inputs.commit_hash }}
           restore-keys: |
-            ccache-win64-cross-msvc-develop-${{ github.event.inputs.commit_hash }}
+            ccache-win64-cross-msvc-${{ github.event.inputs.commit_hash }}
             ccache-win64-cross-msvc
       - name: Restore steam SDK
         uses: actions/cache@v3
         with:
-          path: depends/steam/steamworks_sdk_156.zip
+          path: depends/steam
           key: steam-sdk-156
           enableCrossOsArchive: true
       - name: Cross-compile win64 artifacts