Merge pull request #4 from connectivecpp/develop

cliffg-softwarelibre · web-flow · commit 73083919e820 · 2025-01-08T16:23:42.000-07:00
Updating to latest Catch2 and macos-15 on GH action runner and Asio lib
diff --git a/.github/workflows/build_run_unit_test_cmake.yml b/.github/workflows/build_run_unit_test_cmake.yml
@@ -12,7 +12,7 @@ jobs:
   build_matrix:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-15]
     runs-on: ${{ matrix.os }}
     defaults:
       run:
diff --git a/cmake/download_asio_cpm.cmake b/cmake/download_asio_cpm.cmake
@@ -11,7 +11,7 @@ set ( THREADS_PREFER_PTHREAD_FLAG TRUE )
 find_package ( Threads REQUIRED )
 
 include ( cmake/download_cpm.cmake )
-CPMAddPackage ( "gh:chriskohlhoff/asio#asio-1-31-0@1.31.0" )
+CPMAddPackage ( "gh:chriskohlhoff/asio#asio-1-32-0@1.32.0" )
 
 # ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows:
 #
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -15,7 +15,7 @@ target_compile_features ( periodic_timer_test PRIVATE cxx_std_20 )
 # add dependencies
 include ( ../cmake/download_cpm.cmake )
 
-CPMAddPackage ( "gh:catchorg/Catch2@3.7.0" )
+CPMAddPackage ( "gh:catchorg/Catch2@3.8.0" )
 
 set ( CMAKE_THREAD_PREFER_PTHREAD TRUE )
 set ( THREADS_PREFER_PTHREAD_FLAG TRUE )

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ set ( THREADS_PREFER_PTHREAD_FLAG TRUE )`
`11`	`11`	`find_package ( Threads REQUIRED )`
`12`	`12`
`13`	`13`	`include ( cmake/download_cpm.cmake )`
`14`		`-CPMAddPackage ( "gh:chriskohlhoff/asio#asio-1-31-0@1.31.0" )`
	`14`	`+CPMAddPackage ( "gh:chriskohlhoff/asio#asio-1-32-0@1.32.0" )`
`15`	`15`
`16`	`16`	`# ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows:`
`17`	`17`	`#`