From 9fa95f60a997287cffaa0e5b6b59c50357fe2969 Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Tue, 7 Jan 2025 21:38:36 -0700 Subject: [PATCH 1/4] Updating Catch2 to v3.8.0 --- examples/intro_generic_programming/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/intro_generic_programming/CMakeLists.txt b/examples/intro_generic_programming/CMakeLists.txt index 3fcd1a0..4419b6e 100644 --- a/examples/intro_generic_programming/CMakeLists.txt +++ b/examples/intro_generic_programming/CMakeLists.txt @@ -15,7 +15,7 @@ target_compile_features ( intro_generic_programming_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" ) CPMAddPackage ( "gh:TimQuelch/decimal#1.0.0" ) # link dependencies From f5e7a97fd964a72a75eeccd6b816b987b0350077 Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Tue, 7 Jan 2025 21:46:50 -0700 Subject: [PATCH 2/4] Updated macos runner to macos-15 --- .github/workflows/build_run_unit_test_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_run_unit_test_cmake.yml b/.github/workflows/build_run_unit_test_cmake.yml index f8e31af..809e2ff 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] # os: [ubuntu-latest] runs-on: ${{ matrix.os }} defaults: From 29b5019977d34b301b21e8c66622bbd40e3db220 Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Tue, 7 Jan 2025 21:55:16 -0700 Subject: [PATCH 3/4] Adding cpp file for GH Languages percentage --- cpp_file_for_gh.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 cpp_file_for_gh.cpp diff --git a/cpp_file_for_gh.cpp b/cpp_file_for_gh.cpp new file mode 100644 index 0000000..0dadf16 --- /dev/null +++ b/cpp_file_for_gh.cpp @@ -0,0 +1,8 @@ +// Cliff note - I've burned hours and hours trying to get the GitHub Languages percentage +// histogram to be correct with respect to having C++ files in the Presentations repo. +// +// So this file is simply a C++ file that doesn't really do anything. + +int main() { + return 0; +} From b5520ba2e6e727d757bfb5f784b24b272484571e Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Tue, 7 Jan 2025 21:58:01 -0700 Subject: [PATCH 4/4] Updating Catch2 to v3.8.0 --- examples/std_span/CMakeLists.txt | 2 +- examples/unit_test_with_catch2/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/std_span/CMakeLists.txt b/examples/std_span/CMakeLists.txt index e952033..f599c8f 100644 --- a/examples/std_span/CMakeLists.txt +++ b/examples/std_span/CMakeLists.txt @@ -15,7 +15,7 @@ target_compile_features ( std_span_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" ) # link dependencies target_link_libraries ( std_span_test PRIVATE Catch2::Catch2WithMain ) diff --git a/examples/unit_test_with_catch2/CMakeLists.txt b/examples/unit_test_with_catch2/CMakeLists.txt index 9a86d80..79cd5b9 100644 --- a/examples/unit_test_with_catch2/CMakeLists.txt +++ b/examples/unit_test_with_catch2/CMakeLists.txt @@ -15,7 +15,7 @@ target_compile_features ( unit_test_with_catch2_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" ) # link dependencies target_link_libraries ( unit_test_with_catch2_test PRIVATE Catch2::Catch2WithMain )