amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-11 18:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into claude/issue-5387-duplicate-check-bd7853

Browse Source 
Resolves conflicts from develop's binary-reader and serializer rewrites,
and the unit-regression2.cpp/unit-regression3.cpp split (#5511): took
develop's version of the split test files wholesale (content-equivalent,
confirmed by comparing SECTION/TEST_CASE names), and combined the
ci_cmake_options CI matrix (ci_test_simdutf + ci_test_no_thread_local).

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-11 09:43:37 +02:00
parent bb1fc5eb9a 0452641c18
commit c091b7091a
36 changed files with 8436 additions and 4041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ubuntu.yml
+1 -1
View File
@@ -100,7 +100,7 @@ jobs:
container: ubuntu:focal
strategy:
matrix:
target: [ci_cmake_flags, ci_test_diagnostics, ci_test_diagnostic_positions, ci_test_noexceptions, ci_test_noimplicitconversions, ci_test_legacycomparison, ci_test_noglobaludls, ci_test_no_thread_local]
target: [ci_cmake_flags, ci_test_diagnostics, ci_test_diagnostic_positions, ci_test_noexceptions, ci_test_noimplicitconversions, ci_test_legacycomparison, ci_test_noglobaludls, ci_test_simdutf, ci_test_no_thread_local]
steps:
- name: Install build-essential
run: apt-get update ; apt-get install -y build-essential unzip wget git libssl-dev