From 2d7024eed100fd1d18d6d72fc5efd45400b7c758 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 29 Sep 2026 23:16:38 +0200 Subject: [PATCH] Fix CI: read the json_view.hpp amalgamation config from the pull request The "check" job (Check amalgamation) runs develop's amalgamate.py and read all configurations from the develop checkout, where config_json_view.json does not exist until this stack lands, so it failed with FileNotFoundError. Read that configuration from the pull request's checkout; the tool itself stays develop's. Signed-off-by: Niels Lohmann --- .github/workflows/check_amalgamation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_amalgamation.yml b/.github/workflows/check_amalgamation.yml index 62776e7ac..a6b876a7c 100644 --- a/.github/workflows/check_amalgamation.yml +++ b/.github/workflows/check_amalgamation.yml @@ -68,7 +68,9 @@ jobs: python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json.json -s . python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_fwd.json -s . cp include/nlohmann/json_literals.hpp $INCLUDE_DIR/json_literals.hpp - python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_view.json -s . + # the configuration of json_view.hpp comes with the pull request until + # it is on develop; the tool itself is still develop's + python3 $TOOL_DIR/amalgamate.py -c $MAIN_DIR/tools/amalgamate/config_json_view.json -s . # the header list of the Bazel "json" target must match the files in include/ cmake -P cmake/scripts/gen_bazel_build_file.cmake