From 698dc562223ce33cc7f14aa3cd9b2febd47b9f81 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 5 Jun 2022 19:20:02 -0400
Subject: [PATCH 1/6] GitHub Actions: Upgrade newest matrix entry to Ubuntu
 22.04, GCC 12

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31fde3b1d..285a44578 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,12 @@ jobs:
         plugins:
         - default
         include:
-        - os: ubuntu-20.04
+        - os: ubuntu-22.04
           gcc: 11
           plugins: all
+        - os: ubuntu-22.04
+          gcc: 12
+          plugins: all
     steps:
     - name: Set up Python 3
       uses: actions/setup-python@v2

From 3f6b30af15dc023341e711f0096788763b3b7785 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 22:01:52 -0400
Subject: [PATCH 2/6] Update stonesense

---
 plugins/stonesense | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/stonesense b/plugins/stonesense
index 290862549..841803ca6 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 2908625499accc4899e9a9f0e999c95be26ce14d
+Subproject commit 841803ca6f173f4d97eea376b4dcd512336e35e2

From e3f617d98e59363daca706a36f26afc0c1f89d01 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 22:18:13 -0400
Subject: [PATCH 3/6] build.yml: Force CMake to use ccache

CMake in the Ubuntu 22.04 environment doesn't seem to pick up on ccache
implicitly anymore.
---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 285a44578..bbb44a2cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,6 +90,8 @@ jobs:
           -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
           -DBUILD_SUPPORTED:BOOL=1 \
+          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
     - name: Build DFHack
       run: |

From b3618810c37afa5acc04f5d906e52271ba51ba4f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jun 2022 22:21:48 -0400
Subject: [PATCH 4/6] Add ccache stats to build output

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbb44a2cd..02e6709fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,6 +96,7 @@ jobs:
     - name: Build DFHack
       run: |
         ninja -C build-ci install
+        ccache --show-stats
     - name: Run tests
       id: run_tests
       run: |

From fbdeba62168a83dbce81894f5ad086329f815458 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 9 Jun 2022 01:02:37 -0400
Subject: [PATCH 5/6] Force consistent ccache cache directory

This changed to use ~/.cache/ccache instead of ~/.ccache in ccache 4.

Squashed: fixed to expand `$HOME` in a shell, because `~` in an `env:` block
does not get expanded.
---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02e6709fb..e48aaad06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,6 +59,7 @@ jobs:
         echo "::set-output name=df_version::${DF_VERSION}"
         echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV
         echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV
+        echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
     - name: Fetch DF cache
       uses: actions/cache@v2
       with:

From 078256cc2a7720da5a059c6a00cd045434447f57 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 9 Jun 2022 01:35:55 -0400
Subject: [PATCH 6/6] Remove GCC 11 from build matrix

---
 .github/workflows/build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e48aaad06..21b3096d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,6 @@ jobs:
         plugins:
         - default
         include:
-        - os: ubuntu-22.04
-          gcc: 11
-          plugins: all
         - os: ubuntu-22.04
           gcc: 12
           plugins: all