Merge pull request #16 from connectivecpp/develop

Merging Develop to Main
connectivecpp · Jan 8, 2025 · 9ae749e · 9ae749e
2 parents b59cc70 + b5520ba
commit 9ae749e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
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]
         # os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     defaults:

diff --git a/cpp_file_for_gh.cpp 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;
+}
diff --git 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

diff --git 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
@@ -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 )