mirror of
https://github.com/nlohmann/json.git
synced 2026-09-11 18:57:58 +00:00
Resolve conflicts from develop's independent changes: - .github/workflows/ubuntu.yml: combine the ci_cmake_options matrix targets from both sides (ci_test_disableenumserialization, ci_test_skiplibraryversioncheck from this branch; ci_test_simdutf from develop). - tests/src/unit-regression2.cpp / unit-regression3.cpp: develop split unit-regression2.cpp into two files (#5511) to fix a MinGW linker relocation-overflow issue; take develop's split wholesale (content- equivalent) and port this branch's SKIP_TESTS_FOR_ENUM_SERIALIZATION guard around the two "discussion #4209" sections, which now live in unit-regression3.cpp. Signed-off-by: Niels Lohmann <mail@nlohmann.me>