Skip to content

Fix the CI tests #625

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix the CI tests #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d96183
Update the version of ut in the install test
gaalexandre May 15, 2024
aa658cf
Fix the tests for the Emscripten build
gaalexandre May 15, 2024
938d33c
Add the --break-system-packages argument to pip in macOS CI script
gaalexandre May 15, 2024
0e64c2f
Prevent Apple Clang from using std::source_location
gaalexandre May 15, 2024
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/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Install builddriver
shell: bash
run: pip3 install builddriver cmake_format==0.6.11 pyyaml
run: pip3 install --break-system-package builddriver cmake_format==0.6.11 pyyaml

- name: configure
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ example(minimal minimal)
example(mut mut)
example(matcher matcher)

if(NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
if(NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten")
example(parameterized parameterized)
endif()

Expand Down
2 changes: 1 addition & 1 deletion include/boost/ut.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ constexpr auto regex_match(const char *str, const char *pattern) -> bool {
} // namespace utility

namespace reflection {
#if defined(__cpp_lib_source_location)
#if defined(__cpp_lib_source_location) && !defined(_LIBCPP_APPLE_CLANG_VER)
using source_location = std::source_location;
#else
class source_location {
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 @@ -14,7 +14,7 @@ if(TEST_INSTALLED_VERSION)
set(CMAKE_CXX_EXTENSIONS NO)
endif()

find_package(ut 1.1 REQUIRED)
find_package(ut 2.0.1 REQUIRED)
include(../cmake/AddCustomCommandOrTest.cmake)

enable_testing()
Expand Down