Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/nlohmann/json into fetch…
Browse files Browse the repository at this point in the history
…_content
  • Loading branch information
nlohmann committed Mar 6, 2022
2 parents cd8ca80 + d1e57df commit 6ba3841
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
schedule:
- cron: '0 19 * * 1'
workflow_dispatch:

jobs:
CodeQL-Build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- master
- release/*
pull_request:
workflow_dispatch:

jobs:
xcode:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- master
- release/*
pull_request:
workflow_dispatch:

jobs:
ci_test_clang:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- master
- release/*
pull_request:
workflow_dispatch:

jobs:
mingw:
Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
run: cd build ; ctest -j 10 -C Release --output-on-failure

msvc2019:
runs-on: windows-latest
runs-on: windows-2019
strategy:
matrix:
build_type: [Debug, Release]
Expand All @@ -84,7 +85,7 @@ jobs:
run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure

msvc2019_latest:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -128,7 +129,7 @@ jobs:
run: cd build ; ctest -j 10 -C Release --output-on-failure

clang:
runs-on: windows-latest
runs-on: windows-2019
strategy:
matrix:
version: [11, 12]
Expand All @@ -145,7 +146,7 @@ jobs:
run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure

clang-cl-11:
runs-on: windows-latest
runs-on: windows-2019
strategy:
matrix:
architecture: [Win32, x64]
Expand Down
6 changes: 3 additions & 3 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cff-version: 1.1.0
cff-version: 1.2.0
message: "If you use this software, please cite it as below."
authors:
authors:
- family-names: Lohmann
given-names: Niels
orcid: https://orcid.org/0000-0001-9037-795X
email: mail@nlohmann.me
website: https://nlohmann.me
title: "JSON for Modern C++"
version: 3.10.5
date-released: 2022
date-released: 2022-01-03
license: MIT
repository-code: "https://github.com/nlohmann"
url: https://json.nlohmann.me

0 comments on commit 6ba3841

Please sign in to comment.