Squashed 'external/json/' changes from 9cca280a4..60c48755e
60c48755e Add missing macros in README and link to docs for more info (#4582) a6255cc41 add a ci step for Json_Diagnostic_Positions (#4579) f038ac4c9 Enable modernize-use-integer-sign-comparison check (#4581) 4f64d8d0b Modernize integer comparison (#4577) 2134cb947 Fix NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT with an empty JSON instance (#4508) 6057b31df Overwork astyle call (#4573) 0fa326a8e Use Clang image to run iwyu (#4574) 8314ac2f7 Use ubuntu-latest image to run Valgrind (#4575) 69c8758d5 fix the abi tests for diagnostics positions feature (#4572) 5ff90d9e0 fix diagnostic positions related compilation errors (#4570) 6be4e8560 Bump cppcheck from 1.4.6 to 1.4.7 in /cmake/requirements (#4567) 663058e7d Fix typo in nlohmann_define_derived_type.md (#4565) af4ad7915 Add ONLY_SERIALIZE for NLOHMANN_DEFINE_DERIVED_TYPE_* macros (#4562) 58f5f2596 json start/end position implementation (#4517) 733c59588 Bump actions/upload-artifact from 4.4.3 to 4.5.0 (#4557) 6cb099e30 Suppress modernize-use-integer-sign-comparison (#4558) 094bd2651 Set parents after insert call (#4537) 30cd44df9 Clean up CI (#4553) 5362012fd [StepSecurity] ci: Harden GitHub Actions (#4551) 861ec9c3c Fix token permissions warnings (#4550) f4910b20c Bump mkdocs-material from 9.5.48 to 9.5.49 in /docs/mkdocs (#4548) f2a4ac067 Add step to build the documentation (#4549) 8e1b80001 Move reuse dependency to requirements.txt file (#4547) 677e19e39 Clean up (#4546) 9e23b5d61 ⬆️ Bump watchdog from 2.1.7 to 6.0.0 in /tools/serve_header (#4542) eb142e33c ⬆️ Bump ossf/scorecard-action from 2.3.3 to 2.4.0 (#4545) 1c8e26dcb ⬆️ Bump lukka/get-cmake from 3.31.0 to 3.31.2 (#4544) b6b8378c8 ⬆️ Bump github/codeql-action from 2.27.9 to 3.27.9 (#4543) 58949c0ad ⬆️ Bump actions/github-script from 6.4.0 to 7.0.1 (#4540) 7cfbe321b ⬆️ Bump pyyaml from 6.0 to 6.0.2 in /tools/serve_header (#4541) 4003f8da0 [StepSecurity] Apply security best practices (#4539) 6a2ae22a5 📝 add OpenSSF Scorecard badge 620034ece ♻️ allow patch and diff to be used with arbitrary string types (#4536) e6cafa573 📝 fix CPM.cmake example e0a17f847 📝 add more package managers (#4533) 20ae363a7 Replace EOF with char_traits (#4532) 589641b17 Add support of multi-dim C-style array member of struct. (#4262) f385fe28f 💸 update sponsors 981a4c39f 📝 trigger documentation build dd81f878f 🚀 fix permissions 549c79ba7 Overwork documentation (#4516) 9f60e8555 Fix return value of get_ptr for unsigned integers (#4525) a006a7a48 Add more GCC warning flags (#4524) 1b9a9d1f2 Update licenses (#4521) 935c6eeb5 Optimize binary `get_number` implementation by reading multiple bytes at once (#4391) e41905fcb 💸 thanks @phrrngtn d333f0895 CMake: generate a pkg-config file that follow pkg-config conventions (#4456) 3d6c664de Allow comparing default initialized iterators (#4512) ee32bfc1c Make SAX output locale-independent (#4505) a97041a98 Skip enum tests when JSON_DisableEnumSerialization=ON (#4504) f9f8c0779 fix: integer parsed as float when EINTR set in errno (#4506) 378e09179 Fix weak-vtables warning (#4500) 1f218e107 Possible fix for #4485 (#4487) 64f68dc56 Suppress warnings in NLOHMANN_JSON_SERIALIZE_ENUM (#4497) 1c5923e5d Add comment for #4494 (#4496) e3ac5a64b Add test for libstdc++ (#4495) e509007df Remove alwayslink=True Bazel flag (#4396) 060414037 feat: Rebase `feature/optional` to `develop` (#4036) fd20975a9 Add CPack support (#4459) fde9a86c5 Make iterator_proxy_value a forward_iterator (#4371) (#4372) 1825117e6 Another desperate try to fix the CI (#4489) 4a602df34 Add lgtm explanation (#4362) 18ff442e6 Allow overriding the CMake target name (#4483) aff5a31d3 Add NLOHMANN_DEFINE_DERIVED_TYPE_* macros (#4033) ac8b22180 Update CONTRIBUTING.md (#4486) 632583977 Update is_structured.md (#4472) b36f4c477 Update natvis to reflect 3.11.3 and the current structure of basic_json (#4451) 960b763ec Docs: fix typos of 'whether' in `operator_{gt,le,lt}.md` (#4412) 8c391e04f Docs: Fix wrong code usage in the Value access section of `json_pointer.md` (#4255) 01da82eae Fix gdb pretty printer (#4343) 97f0bdaf9 chore: fix some typos in comments (#4345) c883fb0f1 Fix for incorrect function name in documentation example (#4342) 377c767aa Updated exception handling to catch const reference in out_of_range (#4331) 16b3d841d Fixed an error in the `Custom data source` example. (#4335) 199dea11b #4307 Updated docx to 3.10.5 from 3.10.4 (#4310) 0457de21c Align astyle flags in Makefile with CI (#4277) c35d260c2 Suppress Clang-Tidy warnings (#4276) 6a064e026 Remove broken link from CONTRIBUTING.md (#4274) 7efe87549 Update json_has_static_rtti.md (#4269) a259ecc51 Fix `to_json` for enums when the enum has an unsigned underlying type. (#4237) 3780b41dd 💰 update sponsors git-subtree-dir: external/json git-subtree-split: 60c48755e3f717eace7830d7bbc0d8f1a5e0cc8a
This commit is contained in:
Simone
32
.github/workflows/check_amalgamation.yml
vendored
32
.github/workflows/check_amalgamation.yml
vendored
@@ -3,18 +3,24 @@ name: "Check amalgamation"
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions: read-all
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
save:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden Runner
|
||||
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
- name: Save PR number
|
||||
run: |
|
||||
mkdir -p ./pr
|
||||
echo ${{ github.event.number }} > ./pr/number
|
||||
echo ${{ github.event.pull_request.user.login }} > ./pr/author
|
||||
- uses: actions/upload-artifact@v2
|
||||
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
|
||||
with:
|
||||
name: pr
|
||||
path: pr/
|
||||
@@ -25,29 +31,29 @@ jobs:
|
||||
MAIN_DIR: ${{ github.workspace }}/main
|
||||
INCLUDE_DIR: ${{ github.workspace }}/main/single_include/nlohmann
|
||||
TOOL_DIR: ${{ github.workspace }}/tools/tools/amalgamate
|
||||
ASTYLE_FLAGS: >
|
||||
--style=allman --indent=spaces=4 --indent-modifiers --indent-switches --indent-preproc-block
|
||||
--indent-preproc-define --indent-col1-comments --pad-oper --pad-header --align-pointer=type
|
||||
--align-reference=type --add-brackets --convert-tabs --close-templates --lineend=linux --preserve-date
|
||||
--formatted
|
||||
|
||||
steps:
|
||||
- name: Harden Runner
|
||||
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
- name: Checkout pull request
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
with:
|
||||
path: main
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
|
||||
- name: Checkout tools
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
with:
|
||||
path: tools
|
||||
ref: develop
|
||||
|
||||
- name: Install astyle
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install astyle
|
||||
python3 -mvenv venv
|
||||
venv/bin/pip3 install -r $MAIN_DIR/tools/astyle/requirements.txt
|
||||
|
||||
- name: Check amalgamation
|
||||
run: |
|
||||
@@ -60,11 +66,11 @@ 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 .
|
||||
echo "Format (1)"
|
||||
astyle $ASTYLE_FLAGS --suffix=none --quiet $INCLUDE_DIR/json.hpp $INCLUDE_DIR/json_fwd.hpp
|
||||
${{ github.workspace }}/venv/bin/astyle --project=tools/astyle/.astylerc --suffix=none --quiet $INCLUDE_DIR/json.hpp $INCLUDE_DIR/json_fwd.hpp
|
||||
|
||||
diff $INCLUDE_DIR/json.hpp~ $INCLUDE_DIR/json.hpp
|
||||
diff $INCLUDE_DIR/json_fwd.hpp~ $INCLUDE_DIR/json_fwd.hpp
|
||||
|
||||
astyle $ASTYLE_FLAGS $(find docs/examples include tests -type f \( -name '*.hpp' -o -name '*.cpp' -o -name '*.cu' \) -not -path 'tests/thirdparty/*' -not -path 'tests/abi/include/nlohmann/*' | sort)
|
||||
${{ github.workspace }}/venv/bin/astyle --project=tools/astyle/.astylerc --suffix=orig $(find docs/examples include tests -type f \( -name '*.hpp' -o -name '*.cpp' -o -name '*.cu' \) -not -path 'tests/thirdparty/*' -not -path 'tests/abi/include/nlohmann/*' | sort)
|
||||
echo Check
|
||||
find $MAIN_DIR -name '*.orig' -exec false {} \+
|
||||
|
||||
Reference in New Issue
Block a user