From e4643d1f1b03fc7a1d7b65f17e012ca93680cad8 Mon Sep 17 00:00:00 2001
From: Faruk D <144492+fdiblen@users.noreply.github.com>
Date: Fri, 18 Feb 2022 18:11:44 +0100
Subject: [PATCH 1/2] Fix CITATION.cff and add automatic validation of your
 citation metadata (#3320)

* Update CITATION.cff cffversion to 1.2.0

* Fix CITATION.cff date-released

Co-authored-by: Abel Soares Siqueira <abel.s.siqueira@gmail.com>
---
 CITATION.cff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index 7c28d04fd..40a1d26a2 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -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."
-authors: 
+authors:
   - family-names: Lohmann
     given-names: Niels
     orcid: https://orcid.org/0000-0001-9037-795X
@@ -8,7 +8,7 @@ authors:
     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

From d1e57df48ba72083697d45720a3a0bec227e0f5e Mon Sep 17 00:00:00 2001
From: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
Date: Sun, 6 Mar 2022 13:54:00 +0100
Subject: [PATCH 2/2] Fix and update CI (#3368)

* CI: add workflow_dispatch trigger

* CI: change msvc2019*/clang* runners to windows-2019

GitHub updated their runners. windows-latest is now based on Windows
Server 2022 and comes with different tool versions.
MSVC 2019 is still available via the windows-2019 runner.
---
 .github/workflows/codeql-analysis.yml | 1 +
 .github/workflows/macos.yml           | 1 +
 .github/workflows/ubuntu.yml          | 1 +
 .github/workflows/windows.yml         | 9 +++++----
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 20275feac..01b333497 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -9,6 +9,7 @@ on:
   pull_request:
   schedule:
     - cron: '0 19 * * 1'
+  workflow_dispatch:
 
 jobs:
   CodeQL-Build:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f653e2b6b..6a378f13f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -7,6 +7,7 @@ on:
       - master
       - release/*
   pull_request:
+  workflow_dispatch:
 
 jobs:
   xcode:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index eb544007e..634545a4f 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -7,6 +7,7 @@ on:
       - master
       - release/*
   pull_request:
+  workflow_dispatch:
 
 jobs:
   ci_test_clang:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9d0989a51..e8ca95d51 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,6 +7,7 @@ on:
       - master
       - release/*
   pull_request:
+  workflow_dispatch:
 
 jobs:
   mingw:
@@ -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]
@@ -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
@@ -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]
@@ -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]