Expand PR checks to cover windows-2022

pr-checks/checks/analyze-ref-input.yml

@@ -1,8 +1,5 @@
 name: "Analyze: 'ref' and 'sha' from inputs"
 description: "Checks that specifying 'ref' and 'sha' as inputs works"
-# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
-# `windows-latest`.
-os: [ubuntu-latest, macos-latest, windows-2019]
 steps:
   - uses: ./../action/init
     with:

pr-checks/checks/go-custom-queries.yml

@@ -1,8 +1,5 @@
 name: "Go: Custom queries"
 description: "Checks that Go works in conjunction with a config file specifying custom queries"
-# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
-# `windows-latest`.
-os: [ubuntu-latest, macos-latest, windows-2019]
 steps:
   - uses: actions/setup-go@v2
     with:

pr-checks/checks/go-custom-tracing.yml

@@ -1,8 +1,5 @@
 name: "Go: Custom tracing"
 description: "Checks that Go tracing works"
-# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
-# `windows-latest`.
-os: [ubuntu-latest, macos-latest, windows-2019]
 env:
   CODEQL_EXTRACTOR_GO_BUILD_TRACING: "true"
 steps:

pr-checks/checks/remote-config.yml

@@ -1,8 +1,5 @@
 name: "Remote config file"
 description: "Checks that specifying packages using only a config file works"
-# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
-# `windows-latest`.
-os: [ubuntu-latest, macos-latest, windows-2019]
 steps:
   - uses: ./../action/init
     with:

pr-checks/checks/upload-ref-sha-input.yml

@@ -1,8 +1,5 @@
 name: "Upload-sarif: 'ref' and 'sha' from inputs"
 description: "Checks that specifying 'ref' and 'sha' as inputs works"
-# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
-# `windows-latest`.
-os: [ubuntu-latest, macos-latest, windows-2019]
 steps:
   - uses: ./../action/init
     with:

pr-checks/sync.py

@@ -15,7 +15,7 @@ defaultTestVersions = [
     # A nightly build directly from the our private repo, built in the last 24 hours.
     "nightly-latest"
 ]
-defaultOperatingSystems = ["ubuntu-latest", "macos-latest", "windows-latest"]
+defaultOperatingSystems = ["ubuntu-latest", "macos-latest", "windows-2019"]
 header = """# Warning: This file is generated automatically, and should not be modified.
 # Instead, please modify the template in the pr-checks directory and run:
 #     pip install ruamel.yaml && python3 sync.py
@@ -62,11 +62,26 @@ for file in os.listdir('checks'):
     ]
     steps.extend(checkSpecification['steps'])
 
+    matrix = []
+    for version in versions:
+        for os in operatingSystems:
+            matrix.append({
+                'os': os,
+                'version': version
+            })
+            if (version == 'latest' or version == 'nightly-latest') and os == 'windows-2019':
+                # New versions of the CLI should also work with Windows Server 2022.
+                # Once all versions of the CLI that we test against work with Windows Server 2022,
+                # we should remove this logic and instead just add windows-2022 to the test matrix.
+                matrix.append({
+                    'os': 'windows-2022',
+                    'version': version
+                })
+
     checkJob = {
         'strategy': {
             'matrix': {
-                'version': versions,
-                'os': operatingSystems
+                'include': matrix
             }
         },
         'name': checkSpecification['name'],