Merge branch 'release/3.11.0'

.clang-tidy

@@ -4,6 +4,7 @@ Checks: '*,
          -altera-unroll-loops,
          -android-cloexec-fopen,
          -bugprone-easily-swappable-parameters,
+         -cert-err58-cpp,
          -concurrency-mt-unsafe,
          -cppcoreguidelines-avoid-goto,
          -cppcoreguidelines-avoid-magic-numbers,
@@ -42,6 +43,7 @@ Checks: '*,
          -readability-identifier-length,
          -readability-magic-numbers,
          -readability-redundant-access-specifiers,
+         -readability-simplify-boolean-expr,
          -readability-uppercase-literal-suffix'
 
 CheckOptions:

.github/ISSUE_TEMPLATE/bug.yaml

@@ -0,0 +1,93 @@
+name: Bug Report
+description: Create a bug report
+labels:
+  - 'kind: bug'
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to fill out this bug report!
+        
+        Make sure you give it a short and specific **title** so that the report
+        is searchable and uniquely identifiable.
+        
+        Note that this form is for bug reports only. Please
+        [open a discussion](https://github.com/nlohmann/json/discussions/new)
+        for questions, feature requests, or support requests
+  - type: textarea
+    id: summary
+    attributes:
+      label: Description
+      description: >
+        Please provide an abstract description of the issue to the developers,
+        and why you consider it to be a bug. Please include any specific links
+        to the documentation, JSON specification, or code.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Reproduction steps
+      description: >
+        How do you trigger the bug? Please walk us through step by step. Be as
+        specific as possible.
+    validations:
+      required: true
+  - type: textarea
+    id: results
+    attributes:
+      label: Expected vs. actual results
+      description: >
+        Please describe what you expected to happen after the steps above and
+        what actually happened.
+    validations:
+      required: true
+  - type: textarea
+    id: code
+    attributes:
+      label: Minimal code example
+      description: >
+        If possible, provide a small and self-contained example that triggers
+        the bug. Please understand that we cannot analyze and debug large code
+        bases. Please do not paste screenshots here.
+      render: Shell
+  - type: textarea
+    id: output
+    attributes:
+      label: Error messages
+      description: >
+        Please provide any kind of error output (compilation errors, exception
+        messages, stack traces, etc.) which can help to diagnose the error.
+      render: Shell
+  - type: input
+    id: compiler
+    attributes:
+      label: Compiler and operating system
+      description: >
+        On which operating systems and compilers have you observed the issue?
+        Include as many relevant details about the environment you experienced
+        the bug in. Make sure you use a
+        [supported compiler](https://github.com/nlohmann/json#supported-compilers).
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Library version
+      description: >
+        Which version of the library did you use? If it is a released version,
+        please enter the version number (e.g., 3.11.0). Otherwise, please enter
+        the commit hash. If you got the library from another source as the
+        GitHub repository (e.g., via a package manager), please also state
+        this.
+    validations:
+      required: true
+  - type: checkboxes
+    id: validation
+    attributes:
+      label: Validation
+      description: >
+        Please check these additional steps:
+      options:
+        - label: The bug also occurs if the latest version from the [`develop`](https://github.com/nlohmann/json/tree/develop) branch is used.
+        - label: I can successfully [compile and run the unit tests](https://github.com/nlohmann/json#execute-unit-tests).

.drone.yml → .github/external_ci/.drone.yml

@@ -18,5 +18,5 @@ steps:
   - cd build
   - ../cmake-3.20.2/bin/cmake .. -DJSON_FastTests=ON
   - make -j10
-  - cd test
+  - cd tests
   - ../../cmake-3.20.2/bin/ctest -j10

appveyor.yml → .github/external_ci/appveyor.yml

@@ -66,15 +66,15 @@ before_build:
   - cmake . -G "%GENERATOR%" -A "%GENERATOR_PLATFORM%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" -DJSON_BuildTests=On "%CMAKE_OPTIONS%"
 
 build_script:
-  - cmake --build . --config "%configuration%"
+  - cmake --build . --config "%configuration%" --parallel 2
 
 test_script:
-  - if "%configuration%"=="Release" ctest -C "%configuration%" -V -j
+  - if "%configuration%"=="Release" ctest -C "%configuration%" --parallel 2 --output-on-failure
   # On Debug builds, skip test-unicode_all
   # as it is extremely slow to run and cause
   # occasional timeouts on AppVeyor.
   # More info: https://github.com/nlohmann/json/pull/1570
-  - if "%configuration%"=="Debug" ctest --exclude-regex "test-unicode" -C "%configuration%" -V -j
+  - if "%configuration%"=="Debug" ctest --exclude-regex "test-unicode" -C "%configuration%" --parallel 2 --output-on-failure
 
 # only build PRs and commits to develop branch
 # (see https://help.appveyor.com/discussions/questions/55079-two-builds-per-commit-to-pull-request)

.github/workflows/codeql-analysis.yml

@@ -9,6 +9,11 @@ on:
   pull_request:
   schedule:
     - cron: '0 19 * * 1'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   CodeQL-Build:
@@ -17,10 +22,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
+        # a pull request then we can check out the head.
         fetch-depth: 2
 
     # If this run was triggered by a pull request event, then checkout
@@ -30,15 +35,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -52,4 +57,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/macos.yml

@@ -7,9 +7,14 @@ on:
       - master
       - release/*
   pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
-  xcode:
+  xcode_1:
     runs-on: macos-10.15
     strategy:
       matrix:
@@ -18,7 +23,24 @@ jobs:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: cmake
+        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON
+      - name: build
+        run: cmake --build build --parallel 10
+      - name: test
+        run: cd build ; ctest -j 10 --output-on-failure
+
+  xcode_2:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        xcode: [13.3.1, 13.3, 13.2.1, 13.2, 13.1]
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+
+    steps:
+      - uses: actions/checkout@v3
       - name: cmake
         run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON
       - name: build
@@ -27,17 +49,17 @@ jobs:
         run: cd build ; ctest -j 10 --output-on-failure
 
   xcode_standards:
-    runs-on: macos-10.15
+    runs-on: macos-latest
     strategy:
       matrix:
         standard: [11, 14, 17, 20]
     env:
       DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: cmake
-        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DCMAKE_CXX_STANDARD_REQUIRED=ON
+        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_TestStandards=${{ matrix.standard }}
       - name: build
         run: cmake --build build --parallel 10
       - name: test