Skip to content

Merge develop to main #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 9, 2025
Merged

Merge develop to main #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7362d73
Updating to latest Catch2 and macos-15 on GH action runner
cliffg-softwarelibre Jan 8, 2025
ddbd7b3
Trying out different clang compiler on macos
cliffg-softwarelibre Jan 8, 2025
893a683
Trying out different clang compiler on macos, 2nd try
cliffg-softwarelibre Jan 8, 2025
4be6bc6
Trying out different clang compiler on macos, 3rd try
cliffg-softwarelibre Jan 8, 2025
fe4e88c
Macos build taken out
cliffg-softwarelibre Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_run_unit_test_cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build_matrix:
strategy:
matrix:
# os: [ubuntu-latest, windows-latest, macos-14]
# os: [ubuntu-latest, windows-latest, macos-15]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
defaults:
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading