Bump ccaches 50%

CleverRaven · Dec 15, 2024 · 1869728 · 1869728
1 parent 7cef5e8
commit 1869728
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -94,10 +94,7 @@ jobs:
             dont_skip_data_only_changes: 1
             mods: --mods=magiclysm
             title: Basic Build and Test (Clang 10, Ubuntu, Curses)
-            # ~190MB in a clean build
-            # ~30MB compressed
-            # observed usage: 3.0GB -> 300MB
-            ccache_limit: 2G
+            ccache_limit: 3G
             ccache_key: linux-llvm-10-break1
 
           - compiler: clang++
@@ -109,8 +106,7 @@ jobs:
             sound: 1
             localize: 1
             title: Clang 14, macOS 12, Tiles, Sound, x64 and arm64 Universal Binary
-            # cache size ??? to be observed
-            ccache_limit: 4G
+            ccache_limit: 6G
             ccache_key: macos-llvm-14-universal-break1
 
           - compiler: g++-9
@@ -126,10 +122,7 @@ jobs:
             pch: 1
             cxxflags: -gsplit-dwarf
             title: GCC 9, Curses, LTO
-            # ~850MB in a clean build
-            # ~370MB compressed
-            # observed usage: 4.0GB -> 1.5GB
-            ccache_limit: 3G
+            ccache_limit: 4.5G
             ccache_key: linux-gcc-9-lto
 
           - compiler: clang++-12
@@ -144,10 +137,7 @@ jobs:
             cxxflags: --gcc-toolchain=/opt/mock-gcc-11
             dont_skip_data_only_changes: 1
             title: Clang 12, Ubuntu, Tiles, ASan
-            # ~390MB in a clean build
-            # ~50MB compressed
-            # observed usage: 4.0GB -> 400MB
-            ccache_limit: 3G
+            ccache_limit: 4.5G
             ccache_key: linux-llvm-12-asan
 
           - compiler: g++-11
@@ -160,10 +150,7 @@ jobs:
             pch: 1
             sanitize: address
             title: GCC 11, Ubuntu, Curses, ASan
-            # ~480MB in a clean build
-            # ~50MB compressed
-            # observed usage: 4.4GB -> 400MB
-            ccache_limit: 4G
+            ccache_limit: 6G
             ccache_key: linux-gcc-11-asan
 
           - compiler: g++-9
@@ -175,17 +162,9 @@ jobs:
             native: linux64
             pch: 1
             title: GCC 9, Ubuntu, Tiles, Sound, CMake
-            # ~180MB in a clean build
-            # ~25MB compressed
-            # observed usage: 3.0GB -> 300MB
-            ccache_limit: 2G
+            ccache_limit: 3G
             ccache_key: linux-gcc-9-cmake
 
-          # Reserving space for msvc ccache & vcpkg cache
-            # observed usage:
-            # vcpkg: ??? -> 500MB
-            # ccache: 8GB -> 1.0GB
-
     name: ${{ matrix.title }}
     runs-on: ${{ matrix.os }}
     env:

diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
@@ -40,7 +40,7 @@ env:
   # Enable pretty backtraces
   BACKTRACE: 1
   # Compressed size ~1GB based on observations
-  CCACHE_LIMIT: 8GB
+  CCACHE_LIMIT: 9GB
   CDDA_CCACHE_PATH: ${{ github.workspace }}\ccache\
   CDDA_USE_CCACHE: true
   # There's not enough disk space to build both release and debug versions of