Merge pull request #146 from ptr727/develop

Develop
ptr727 · Apr 12, 2024 · d6bab91 · d6bab91
2 parents c75be87 + 295cf76
commit d6bab91
Show file tree

Hide file tree

Showing 29 changed files with 663 additions and 362 deletions.
diff --git a/.github/workflows/BuildPublishPipeline.yml b/.github/workflows/BuildPublishPipeline.yml
@@ -108,6 +108,8 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      # Keep building even if a job fails, helps with troubleshooting
+      fail-fast: false
       # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
       matrix:
         images: ${{ fromJson(needs.setmatrix.outputs.matrix).images }}

diff --git a/CreateMatrix/CreateMatrix.csproj b/CreateMatrix/CreateMatrix.csproj
@@ -8,11 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
+    <PackageReference Include="JsonSchema.Net.Generation" Version="4.3.0" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="CreateMatrixTests" />
+  </ItemGroup>
+
 </Project>
diff --git a/CreateMatrix/JSON/Matrix.schema.json b/CreateMatrix/JSON/Matrix.schema.json
@@ -1,79 +1,46 @@
 {
-  "$schema": "https://json-schema.org/draft-06/schema",
-  "$id": "https://raw.githubusercontent.com/ptr727/NxWitness/main/CreateMatrix/JSON/Matrix.schema.json",
-  "title": "CreateMatrix Matrix Schema",
-  "definitions": {
-    "ImageInfo": {
-      "type": [
-        "object",
-        "null"
-      ],
-      "properties": {
-        "Name": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "Branch": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "CacheScope": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "Tags": {
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": [
-              "string",
-              "null"
-            ]
-          }
-        },
-        "Args": {
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "type": [
-              "string",
-              "null"
-            ]
+  "type": "object",
+  "properties": {
+    "Images": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "Args": {
+            "$ref": "#/$defs/listOfString"
+          },
+          "Branch": {
+            "type": "string"
+          },
+          "CacheScope": {
+            "type": "string"
+          },
+          "Name": {
+            "type": "string"
+          },
+          "Tags": {
+            "$ref": "#/$defs/listOfString"
           }
         }
       }
-    }
-  },
-  "type": "object",
-  "properties": {
+    },
     "$schema": {
-      "type": [
-        "string",
-        "null"
-      ]
+      "type": "string",
+      "readOnly": true
     },
     "SchemaVersion": {
-      "type": "integer",
-      "default": 0
-    },
-    "Images": {
+      "type": "integer"
+    }
+  },
+  "$defs": {
+    "listOfString": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/ImageInfo"
+        "type": "string"
       }
     }
   },
-  "required": [
-    "Images"
-  ]
+  "title": "CreateMatrix Matrix Schema",
+  "$id": "https://raw.githubusercontent.com/ptr727/NxWitness/main/CreateMatrix/JSON/Matrix.schema.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
 }
diff --git a/CreateMatrix/JSON/Version.schema.json b/CreateMatrix/JSON/Version.schema.json
@@ -1,80 +1,60 @@
 {
-  "$schema": "https://json-schema.org/draft-06/schema",
-  "$id": "https://raw.githubusercontent.com/ptr727/NxWitness/main/CreateMatrix/JSON/Version.schema.json",
-  "title": "CreateMatrix Version Schema",
-  "definitions": {
-    "ProductInfo": {
-      "type": [
-        "object",
-        "null"
-      ],
-      "properties": {
-        "Product": {},
-        "Versions": {
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "$ref": "#/definitions/VersionInfo"
+  "type": "object",
+  "properties": {
+    "Products": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "Product": {
+            "enum": [
+              "None",
+              "NxMeta",
+              "NxWitness",
+              "DWSpectrum"
+            ]
+          },
+          "Versions": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "Labels": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "None",
+                      "Stable",
+                      "Latest",
+                      "Beta",
+                      "RC"
+                    ]
+                  }
+                },
+                "UriArm64": {
+                  "type": "string"
+                },
+                "UriX64": {
+                  "type": "string"
+                },
+                "Version": {
+                  "type": "string"
+                }
+              }
+            }
           }
         }
       }
     },
-    "VersionInfo": {
-      "type": [
-        "object",
-        "null"
-      ],
-      "properties": {
-        "Version": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "UriX64": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "UriArm64": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "Labels": {
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {}
-        }
-      }
-    }
-  },
-  "type": "object",
-  "properties": {
     "$schema": {
-      "type": [
-        "string",
-        "null"
-      ]
+      "type": "string",
+      "readOnly": true
     },
     "SchemaVersion": {
-      "type": "integer",
-      "default": 0
-    },
-    "Products": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/ProductInfo"
-      }
+      "type": "integer"
     }
   },
-  "required": [
-    "Products"
-  ]
+  "title": "CreateMatrix Version Schema",
+  "$id": "https://raw.githubusercontent.com/ptr727/NxWitness/main/CreateMatrix/JSON/Version.schema.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
 }