External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nlohmann/json into fetch_content

Browse Source
This commit is contained in:
Niels Lohmann 2022-03-06 13:54:45 +01:00
commit 6ba384196f
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/codeql-analysis.yml vendored
View File

@ -9,6 +9,7 @@ on:
pull_request: pull_request:
schedule: schedule:
- cron: '0 19 * * 1' - cron: '0 19 * * 1'
workflow_dispatch:
jobs: jobs:
CodeQL-Build: CodeQL-Build:

1
.github/workflows/macos.yml vendored
View File

@ -7,6 +7,7 @@ on:
- master - master
- release/* - release/*
pull_request: pull_request:
workflow_dispatch:
jobs: jobs:
xcode: xcode:

1
.github/workflows/ubuntu.yml vendored
View File

@ -7,6 +7,7 @@ on:
- master - master
- release/* - release/*
pull_request: pull_request:
workflow_dispatch:
jobs: jobs:
ci_test_clang: ci_test_clang:

9
.github/workflows/windows.yml vendored
View File

@ -7,6 +7,7 @@ on:
- master - master
- release/* - release/*
pull_request: pull_request:
workflow_dispatch:
jobs: jobs:
mingw: mingw:
@ -64,7 +65,7 @@ jobs:
run: cd build ; ctest -j 10 -C Release --output-on-failure run: cd build ; ctest -j 10 -C Release --output-on-failure
msvc2019: msvc2019:
runs-on: windows-latest runs-on: windows-2019
strategy: strategy:
matrix: matrix:
build_type: [Debug, Release] build_type: [Debug, Release]
@ -84,7 +85,7 @@ jobs:
run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure
msvc2019_latest: msvc2019_latest:
runs-on: windows-latest runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -128,7 +129,7 @@ jobs:
run: cd build ; ctest -j 10 -C Release --output-on-failure run: cd build ; ctest -j 10 -C Release --output-on-failure
clang: clang:
runs-on: windows-latest runs-on: windows-2019
strategy: strategy:
matrix: matrix:
version: [11, 12] version: [11, 12]
@ -145,7 +146,7 @@ jobs:
run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure
clang-cl-11: clang-cl-11:
runs-on: windows-latest runs-on: windows-2019
strategy: strategy:
matrix: matrix:
architecture: [Win32, x64] architecture: [Win32, x64]

6
CITATION.cff
View File

@ -1,6 +1,6 @@
cff-version: 1.1.0 cff-version: 1.2.0
message: "If you use this software, please cite it as below." message: "If you use this software, please cite it as below."
authors: authors:
- family-names: Lohmann - family-names: Lohmann
given-names: Niels given-names: Niels
orcid: https://orcid.org/0000-0001-9037-795X orcid: https://orcid.org/0000-0001-9037-795X
@ -8,7 +8,7 @@ authors:
website: https://nlohmann.me website: https://nlohmann.me
title: "JSON for Modern C++" title: "JSON for Modern C++"
version: 3.10.5 version: 3.10.5
date-released: 2022 date-released: 2022-01-03
license: MIT license: MIT
repository-code: "https://github.com/nlohmann" repository-code: "https://github.com/nlohmann"
url: https://json.nlohmann.me url: https://json.nlohmann.me