fixed all target; refactored cmake to pull and build deps (more portable); updated workflow

Author: raincity

.github/workflows/build-test-run.yml

@@ -11,6 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     container: darrylwest/ubuntu24-gpp1420:latest
 
+    strategy:
+      matrix:
+        build_type: [Debug, Release]
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -28,16 +32,6 @@ jobs:
         g++ --version
         cmake --version
 
-    - name: Install Catch2
-      run: |
-        git clone https://github.com/catchorg/Catch2.git
-        cd Catch2
-        git checkout v3.7.1
-        cmake -B build -S . -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr/local
-        cmake --build build --parallel $(nproc)
-        cmake --build build --target install
-        cd ..
-
     - name: Configure CMake
       run: |
         cmake -B build \
@@ -62,5 +56,5 @@ jobs:
 
     - name: Run
       run: |
-        echo "=== Running simple-colors example ==="
+        echo "=== Running tiny-app ==="
         ${{github.workspace}}/build/tiny-app

CMakeLists.txt

@@ -57,8 +57,15 @@ CPMAddPackage(
 )
 message(STATUS "cpp-termio library loaded")
 
-find_package(nlohmann_json 3.2.0 REQUIRED)
-find_package(Catch2 3 REQUIRED)
+CPMAddPackage(
+        NAME nlohmann_json
+        GITHUB_REPOSITORY nlohmann/json
+        VERSION 3.11.3)
+
+CPMAddPackage(
+        NAME Catch2
+        GITHUB_REPOSITORY CatchOrg/Catch2
+        VERSION 3.6.0)
 
 # MacOS universal binary setup
 if(APPLE)

mk

@@ -29,7 +29,8 @@ do
             shift
         ;;
         all)
-            ./mk clobber init build unit
+            ./mk pull 
+            ./mk clobber init test run
 
             exit 0
         ;;
@@ -47,7 +48,7 @@ do
             shift
         ;;
         unit|test)
-            # (cd build && time make $FLAGS)
+            (cd build && time make $FLAGS)
             ./build/unit_tests
 
             shift