Skip to content

Commit

Permalink
Add macos-13 to the bulid matrix
Browse files Browse the repository at this point in the history
Signed-off-by: Martynas Gurskas <[email protected]>
  • Loading branch information
Lipt0nas committed Mar 22, 2024
1 parent dfc8ac1 commit e01f2a7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix:
# Ubuntu-20.04 is being used here on purpose instead of ubuntu-latest due to a bug with clang and libstdc++
# https://github.com/actions/runner-images/issues/8659
os: [ubuntu-20.04, windows-latest]
os: [ubuntu-20.04, windows-latest, macos-13, macos-13-xlarge]
build_type: [Release]
cpp_compiler: [g++, clang++, cl]
exclude:
Expand All @@ -29,6 +29,10 @@ jobs:
cpp_compiler: clang++
- os: ubuntu-20.04
cpp_compiler: cl
- os: macos-13
cpp_compiler: cl
- os: macos-13-xlarge
cpp_compiler: cl

steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 4 additions & 1 deletion cpp-tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ set(BINDINGS_SRC_DIR ${BINDINGS_BUILD_DIR}/bindings)
if (WIN32)
set(UNIFFI_FIXTURES_LIB uniffi_bindgen_cpp_fixtures.dll)
set(ADDITIONAL_LIBS ws2_32 userenv advapi32 ntdll crypt32 Bcrypt)
else()
elseif(UNIX AND NOT APPLE)
set(UNIFFI_FIXTURES_LIB libuniffi_bindgen_cpp_fixtures.so)
set(ADDITIONAL_LIBS)
else()
set(UNIFFI_FIXTURES_LIB libuniffi_bindgen_cpp_fixtures.dylib)
set(ADDITIONAL_LIBS)
endif()

find_program(VALGRIND "valgrind")
Expand Down

0 comments on commit e01f2a7

Please sign in to comment.