From 854c9579de0e165f7d70a3df8960f49a1d9d12b1 Mon Sep 17 00:00:00 2001
From: Drulikar <drathek@gmail.com>
Date: Sat, 16 Nov 2024 12:35:07 -0600
Subject: [PATCH] Checkout v4

---
 .github/workflows/ci_suite.yml | 8 ++++----
 tools/mapmerge2/dmm_test.py    | 1 +
 tools/mapmerge2/fixup.py       | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 3be298ab20aa..a392178fb1bc 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -13,14 +13,14 @@ jobs:
       group: run_linters-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Restore SpacemanDMM cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
       - name: Restore Yarn cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tgui/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
@@ -28,7 +28,7 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - name: Restore Rust cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-rust
diff --git a/tools/mapmerge2/dmm_test.py b/tools/mapmerge2/dmm_test.py
index c30105337d29..33f86f694721 100644
--- a/tools/mapmerge2/dmm_test.py
+++ b/tools/mapmerge2/dmm_test.py
@@ -21,6 +21,7 @@ def _self_test():
         print("Unable to determine merge base!")
     else:
         ancestor_commit = repo[ancestor]
+        print("Determined ancestor commit SHA to be:", ancestor)
 
     count = 0
     for dirpath, dirnames, filenames in os.walk('.'):
diff --git a/tools/mapmerge2/fixup.py b/tools/mapmerge2/fixup.py
index 823e06ac5868..42b83cff44ec 100644
--- a/tools/mapmerge2/fixup.py
+++ b/tools/mapmerge2/fixup.py
@@ -74,6 +74,7 @@ def main(repo : pygit2.Repository):
         print("Unable to automatically fix anything because merge base could not be determined.")
         return 1
     ancestor_commit = repo[ancestor]
+    print("Determined ancestor commit SHA to be:", ancestor)
 
     # Walk the head commit tree and convert as needed
     converted = {}