From 1e98d68468d1510c41244699161af5c8cf6bb557 Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Wed, 8 Jan 2025 13:43:30 -0700 Subject: [PATCH] Updating to latest Catch2 and macos-15 on GH action runner and Asio lib --- .github/workflows/build_run_unit_test_cmake.yml | 2 +- cmake/download_asio_cpm.cmake | 2 +- test/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_run_unit_test_cmake.yml b/.github/workflows/build_run_unit_test_cmake.yml index 6fd163b..82c0e0a 100644 --- 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 index 7743f1b..6251256 100644 --- 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 index d71a2e6..e86db4e 100644 --- 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 )