From 46f80bed3daeb105e6350a6ef12854447c245663 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 5 Jun 2022 21:46:24 -0700
Subject: [PATCH 1/3] allow ccache to function again

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 07febaa63..15c653bf8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,7 +65,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.ccache
-        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
+        key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.sha }}
+        restore-keys: |
+          ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
     - name: Download DF
       run: |
         sh ci/download-df.sh

From 5e0a947d518be1494f9b9f7135e668454812a261 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 6 Jun 2022 01:49:00 -0400
Subject: [PATCH 2/3] Fix changelog entry and release for #2028

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 19518fa75..0e3c90855 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -111,6 +111,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - add functions reverse-engineered from ambushing unit code: ``Units::isHidden()``, ``Units::isFortControlled()``, ``Units::getOuterContainerRef()``, ``Items::getOuterContainerRef()``
+- ``Job::removeJob()``: use the job cancel vmethod graciously provided by The Toady One in place of a synthetic method derived from reverse engineering
 
 ## Lua
 - `custom-raw-tokens`: library for accessing tokens added to raws by mods
@@ -161,7 +162,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - ``Buildings::findCivzonesAt()``: lookups now complete in constant time instead of linearly scanning through all civzones in the game
-- ``Job::remove_postings()``: use the job cancel vmethod graciously provided by The Toady One in place of a synthetic method derived from reverse engineering
 
 ## Lua
 - ``argparse.processArgsGetopt()``: you can now have long form parameters that are not an alias for a short form parameter. For example, you can now have a parameter like ``--longparam`` without needing to have an equivalent one-letter ``-l`` param.

From 97775766efe353c7e0a202af4644a07bc04cc445 Mon Sep 17 00:00:00 2001
From: DFHack-Urist via GitHub Actions
 <63161697+DFHack-Urist@users.noreply.github.com>
Date: Mon, 6 Jun 2022 07:16:06 +0000
Subject: [PATCH 3/3] Auto-update submodules

scripts: master
---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a1f31a8d9..52e21c5e0 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a1f31a8d99db600b225f1022c490bfa63ade935a
+Subproject commit 52e21c5e0c78e17acdad23f94efffb043290d5b5