Checkout v4

.github/workflows/ci_suite.yml

@@ -13,22 +13,22 @@ 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') }}
           restore-keys: |
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - name: Restore Rust cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-rust

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('.'):

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 = {}