Skip to content

CI targets - #2561

Merged
nlohmann merged 126 commits into
developfrom
ci
Mar 24, 2021
Merged

nlohmann merged 126 commits into
developfrom
ci

Conversation

@nlohmann

@nlohmann nlohmann commented Dec 30, 2020 •

Copy link
Copy Markdown
Owner

This PR overworks the targets to execute in the CI and when a release is prepared. Right now, these steps are distributed over the configuration files of Travis, AppVeyor, and GitHub Actions, as well as the project's Makefile and some Python scripts. The goal is to have some CMake-based targets that are then executed by a (much simpler) CI. I would also like to get rid of the project's Makefile altogether.

Note: This PR may need to add some targets for MSVC as done in #2245. Closes #1798.

@coveralls

coveralls commented Dec 31, 2020 •

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.02%) to 99.982% when pulling 3d0812a on ci into 6b74772 on develop.

Comment thread test/src/unit-regression2.cpp
@nlohmann
nlohmann marked this pull request as draft January 1, 2021 16:38
@nlohmann nlohmann self-assigned this Jan 2, 2021
Comment thread cmake/ci.cmake
add_custom_target(ci_test_noimplicitconversions
COMMAND CXX=${CLANG_TOOL} ${CMAKE_COMMAND}
-DCMAKE_BUILD_TYPE=Debug -GNinja
-DJSON_BuildTests=ON -DJSON_MultipleHeaders=ON -DJSON_ImplicitConversions=ON

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-DJSON_BuildTests=ON -DJSON_MultipleHeaders=ON -DJSON_ImplicitConversions=ON
-DJSON_BuildTests=ON -DJSON_MultipleHeaders=ON -DJSON_ImplicitConversions=OFF

@nlohmann

Copy link
Copy Markdown
Owner Author

@karzhenkov Thanks, good catch! Fixed in 9d57351.

nlohmann added a commit that referenced this pull request Sep 24, 2026
The target has configured ${PROJECT_SOURCE_DIR}/benchmarks since it was
added in #2561, but the benchmarks live in tests/benchmarks.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

4 participants