# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1716308733 -7200
# Node ID a7d95a082206d4b3eb7c8413d5ed7360d5874c01
# Parent  7f7d6bc5702bf85e3df8edfcc6a3a792ef423bc5# Parent  d4ef37425dff3a6637e97391780bd6339149a361
maint: Merge stable to default.

diff -r 7f7d6bc5702b -r a7d95a082206 .github/workflows/make.yaml
--- a/.github/workflows/make.yaml	Mon May 20 09:12:08 2024 -0700
+++ b/.github/workflows/make.yaml	Tue May 21 18:25:33 2024 +0200
@@ -14,7 +14,7 @@
       matrix:
         # For available GitHub-hosted runners, see:
         # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
-        os: [ubuntu-22.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
         compiler: [gcc, clang]
         include:
           - compiler: gcc
@@ -27,18 +27,17 @@
             cc: "clang"
             cxx: "clang++ -stdlib=libc++"
             extra-config-flags: "--without-spqr --without-magick"
-          # "ccache" on Ubuntu 20.04 doesn't compress the cache.
           # Clang seems to generally require less cache size (smaller object files?).
           - ccache-max: 1.2G
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             compiler: gcc
-            ccache-max: 6G
+            ccache-max: 1.2G
           - os: ubuntu-22.04
             compiler: gcc
             ccache-max: 1.2G
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             compiler: clang
-            ccache-max: 3G
+            ccache-max: 400M
           - os: ubuntu-22.04
             compiler: clang
             ccache-max: 400M