From 7362d73e3df4b026b7fed0970005c7e8fd3e2dd1 Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Wed, 8 Jan 2025 11:09:40 -0700 Subject: [PATCH 1/5] Updating to latest Catch2 and macos-15 on GH action runner --- .github/workflows/build_run_unit_test_cmake.yml | 4 ++-- test/CMakeLists.txt | 2 +- 2 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 487c69a..e253ccc 100644 --- a/.github/workflows/build_run_unit_test_cmake.yml +++ b/.github/workflows/build_run_unit_test_cmake.yml @@ -16,8 +16,8 @@ jobs: build_matrix: strategy: matrix: - # os: [ubuntu-latest, windows-latest, macos-14] - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-15] + # os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} defaults: run: diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 80991b8..ba10fdb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -15,7 +15,7 @@ target_compile_features ( wait_queue_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:martinmoene/ring-span-lite@0.7.0" ) # CPMAddPackage ( "gh:JustasMasiulis/circular_buffer@master" ) CPMAddPackage ( NAME circular_buffer From ddbd7b3466f7146f1f546c7d03fabb50f321fbc2 Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Wed, 8 Jan 2025 16:39:07 -0700 Subject: [PATCH 2/5] Trying out different clang compiler on macos --- .../workflows/build_run_unit_test_cmake.yml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_run_unit_test_cmake.yml b/.github/workflows/build_run_unit_test_cmake.yml index e253ccc..ec82839 100644 --- a/.github/workflows/build_run_unit_test_cmake.yml +++ b/.github/workflows/build_run_unit_test_cmake.yml @@ -16,8 +16,8 @@ jobs: build_matrix: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-15] - # os: [ubuntu-latest, windows-latest] + # os: [ubuntu-latest, windows-latest, macos-15] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} defaults: run: @@ -33,3 +33,19 @@ jobs: run: cd build && cmake --build . --config $BUILD_TYPE - name: run-unit-test run: cd build && ctest -C $BUILD_TYPE + macos_build: + runs-on: macos-15 + defaults: + run: + shell: bash + steps: + - name: checkout + uses: actions/checkout@v4 + - name: create-build-dir + run: mkdir build + - name: configure-cmake + run: cd build && cmake -D CMAKE_CXX_COMPILER=$brew --prefix llvm@18)/binclang++ -D WAIT_QUEUE_BUILD_TESTS:BOOL=ON -D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON -D JM_CIRCULAR_BUFFER_BUILD_TESTS:BOOL=OFF .. + - name: build + run: cd build && cmake --build . --config $BUILD_TYPE + - name: run-unit-test + run: cd build && ctest -C $BUILD_TYPE From 893a683bff3efdb7b0db93b2446467414f70b46b Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Wed, 8 Jan 2025 16:41:09 -0700 Subject: [PATCH 3/5] Trying out different clang compiler on macos, 2nd try --- .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 ec82839..391ec2d 100644 --- a/.github/workflows/build_run_unit_test_cmake.yml +++ b/.github/workflows/build_run_unit_test_cmake.yml @@ -44,7 +44,7 @@ jobs: - name: create-build-dir run: mkdir build - name: configure-cmake - run: cd build && cmake -D CMAKE_CXX_COMPILER=$brew --prefix llvm@18)/binclang++ -D WAIT_QUEUE_BUILD_TESTS:BOOL=ON -D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON -D JM_CIRCULAR_BUFFER_BUILD_TESTS:BOOL=OFF .. + run: cd build && cmake -D CMAKE_CXX_COMPILER=$(brew --prefix llvm@18)/binclang++ -D WAIT_QUEUE_BUILD_TESTS:BOOL=ON -D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON -D JM_CIRCULAR_BUFFER_BUILD_TESTS:BOOL=OFF .. - name: build run: cd build && cmake --build . --config $BUILD_TYPE - name: run-unit-test From 4be6bc67e1faf30eff92930b588b8789d4ef37db Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Wed, 8 Jan 2025 16:44:12 -0700 Subject: [PATCH 4/5] Trying out different clang compiler on macos, 3rd try --- .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 391ec2d..c1ac4fd 100644 --- a/.github/workflows/build_run_unit_test_cmake.yml +++ b/.github/workflows/build_run_unit_test_cmake.yml @@ -44,7 +44,7 @@ jobs: - name: create-build-dir run: mkdir build - name: configure-cmake - run: cd build && cmake -D CMAKE_CXX_COMPILER=$(brew --prefix llvm@18)/binclang++ -D WAIT_QUEUE_BUILD_TESTS:BOOL=ON -D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON -D JM_CIRCULAR_BUFFER_BUILD_TESTS:BOOL=OFF .. + run: cd build && cmake -D CMAKE_CXX_COMPILER=$(brew --prefix llvm@18)/bin/clang++ -D WAIT_QUEUE_BUILD_TESTS:BOOL=ON -D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON -D JM_CIRCULAR_BUFFER_BUILD_TESTS:BOOL=OFF .. - name: build run: cd build && cmake --build . --config $BUILD_TYPE - name: run-unit-test From fe4e88c0565aec0b8df06f50a39071da123ab9ba Mon Sep 17 00:00:00 2001 From: cliffg-softwarelibre Date: Wed, 8 Jan 2025 17:26:03 -0700 Subject: [PATCH 5/5] Macos build taken out --- .github/workflows/build_run_unit_test_cmake.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/build_run_unit_test_cmake.yml b/.github/workflows/build_run_unit_test_cmake.yml index c1ac4fd..f23b9ee 100644 --- a/.github/workflows/build_run_unit_test_cmake.yml +++ b/.github/workflows/build_run_unit_test_cmake.yml @@ -33,19 +33,3 @@ jobs: run: cd build && cmake --build . --config $BUILD_TYPE - name: run-unit-test run: cd build && ctest -C $BUILD_TYPE - macos_build: - runs-on: macos-15 - defaults: - run: - shell: bash - steps: - - name: checkout - uses: actions/checkout@v4 - - name: create-build-dir - run: mkdir build - - name: configure-cmake - run: cd build && cmake -D CMAKE_CXX_COMPILER=$(brew --prefix llvm@18)/bin/clang++ -D WAIT_QUEUE_BUILD_TESTS:BOOL=ON -D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON -D JM_CIRCULAR_BUFFER_BUILD_TESTS:BOOL=OFF .. - - name: build - run: cd build && cmake --build . --config $BUILD_TYPE - - name: run-unit-test - run: cd build && ctest -C $BUILD_TYPE