From 381d7f2ccf15ebab6245bf34ac92f11f6cc417cc Mon Sep 17 00:00:00 2001
From: zachcran <15938371+zachcran@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:24:49 -0600
Subject: [PATCH 1/3] Update CMake versions tested and simplify unit_test CI
 with actions

---
 .github/workflows/integration_tests.yml |  6 +++---
 .github/workflows/unit_test.yml         | 28 +++++++++++--------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index c2d3c493..486a5bcb 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cmake: [3.19.7, latestrc]
+        # [minimum version, latest stable, latest release candidate]
+        cmake: [3.19.7, install, installrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}
       cores: 2
-      os: linux-x86_64
 
     steps:
       - name: Checkout repository
@@ -36,7 +36,7 @@ jobs:
 
       - name: Build Catch2
         run: |
-          prefix=`pwd`/catch2_install
+          prefix=$PWD/catch2_install
           cd catch2
           cmake -H. -Bbuild -DCMAKE_INSTALL_PREFIX="${prefix}"
           cmake --build build --parallel 2
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 920d3e8c..63d8af5d 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -13,33 +13,29 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cmake: [3.19.7, 3.22.4, 3.23.1]
+        # [minimum version, last 3.x, latest stable, latest release candidate]
+        cmake: [3.19.7, 3.31.9, install, installrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}
-      os: linux-x86_64
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-      - name: get cmake
-        env:
-          url_prefix: https://github.com/Kitware/CMake/releases/download
-        run: |
-          cmake_prefix=cmake-${cmake_version}-${os}
-          cmake_script=${cmake_prefix}.sh
-          wget "${url_prefix}/v${cmake_version}/${cmake_script}"
-          mkdir -p ./${cmake_prefix}
-          /bin/sh "${cmake_script}" --prefix=./${cmake_prefix} --exclude-subdir
+      - name: Get CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: ${{ env.cmake_version }}
 
-      - name: configure
+      - name: Configure Project
         run: |
-          cmake-${cmake_version}-${os}/bin/cmake -H. -Bbuild -DBUILD_TESTING=ON
+          cmake -H. -Bbuild -DBUILD_TESTING=ON
 
-      - name: unit_test
+      - name: Unit Tests
         run: |
           cd build
-          ../cmake-${cmake_version}-${os}/bin/ctest \
+          ctest \
               j 2 \
               --output-on-failure \
               -LE integration_tests

From 77ca67b5bc96658ee9ac784404b20115c468f544 Mon Sep 17 00:00:00 2001
From: zachcran <15938371+zachcran@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:30:17 -0600
Subject: [PATCH 2/3] Synchronize CMake versions between unit and integration
 tests

---
 .github/workflows/integration_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 486a5bcb..1c359242 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         # [minimum version, latest stable, latest release candidate]
-        cmake: [3.19.7, install, installrc]
+        cmake: [3.19.7, 3.31.9, install, installrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}

From 204f19444c307db8713be78174f77d13ed4e88ec Mon Sep 17 00:00:00 2001
From: zachcran <15938371+zachcran@users.noreply.github.com>
Date: Mon, 27 Oct 2025 11:16:53 -0600
Subject: [PATCH 3/3] Re-add os for future matrix; change 'install' to 'latest'
 version keywords

---
 .github/workflows/integration_tests.yml | 3 ++-
 .github/workflows/unit_test.yml         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 1c359242..47f38b9c 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -14,11 +14,12 @@ jobs:
     strategy:
       matrix:
         # [minimum version, latest stable, latest release candidate]
-        cmake: [3.19.7, 3.31.9, install, installrc]
+        cmake: [3.19.7, 3.31.9, latest, latestrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}
       cores: 2
+      os: linux-x86_64
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 63d8af5d..018fdc27 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -14,10 +14,11 @@ jobs:
     strategy:
       matrix:
         # [minimum version, last 3.x, latest stable, latest release candidate]
-        cmake: [3.19.7, 3.31.9, install, installrc]
+        cmake: [3.19.7, 3.31.9, latest, latestrc]
 
     env:
       cmake_version: ${{ matrix.cmake }}
+      os: linux-x86_64
 
     steps:
       - name: Checkout repository