Rework settings.json to include spack-config, updated schema

CodeGat · CodeGat · commit ca2e9171a62d · 2024-09-18T14:23:39.000+10:00
diff --git a/config/settings.json b/config/settings.json
@@ -3,16 +3,21 @@
   "deployment": {
     "Gadi": {
       "Release": {
-        "spack": {
-          "0.20": "6812713cf470b473a607f0de0e8e1cf53f804fb7",
-          "0.22": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d"
+        "0.20": {
+          "spack": "6812713cf470b473a607f0de0e8e1cf53f804fb7",
+          "spack-config": "2024.03.22"
+        },
+        "0.22": {
+          "spack": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d",
+          "spack-config": "2024.07.05"
         }
       },
       "Prerelease": {
-        "spack": {
-          "0.22": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d"
+        "0.22": {
+          "spack": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d",
+          "spack-config": "2024.07.05"
         }
       }
     }
   }
-}
+}
diff --git a/config/settings.schema.json b/config/settings.schema.json
@@ -15,39 +15,41 @@
           "properties": {
             "Release": {
               "type": "object",
-              "properties": {
-                "spack": {
+              "patternProperties": {
+                "^.+$": {
                   "type": "object",
-                  "patternProperties": {
-                    "^.+$": {
+                  "properties": {
+                    "spack": {
+                      "type": "string"
+                    },
+                    "spack-config": {
                       "type": "string"
                     }
                   },
-                  "additionalProperties": true
+                  "additionalProperties": true,
+                  "required": ["spack", "spack-config"]
                 }
               },
-              "additionalProperties": true,
-              "required": [
-                "spack"
-              ]
+              "additionalProperties": true
             },
             "Prerelease": {
               "type": "object",
-              "properties": {
-                "spack": {
+              "patternProperties": {
+                "^.+$": {
                   "type": "object",
-                  "patternProperties": {
-                    "": {
+                  "properties": {
+                    "spack": {
+                      "type": "string"
+                    },
+                    "spack-config": {
                       "type": "string"
                     }
                   },
-                  "additionalProperties": true
+                  "additionalProperties": true,
+                  "required": ["spack", "spack-config"]
                 }
               },
-              "additionalProperties": true,
-              "required": [
-                "spack"
-              ]
+              "additionalProperties": true
             }
           },
           "additionalProperties": true,

Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,21 @@`
`3`	`3`	`"deployment": {`
`4`	`4`	`"Gadi": {`
`5`	`5`	`"Release": {`
`6`		`- "spack": {`
`7`		`- "0.20": "6812713cf470b473a607f0de0e8e1cf53f804fb7",`
`8`		`- "0.22": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d"`
	`6`	`+ "0.20": {`
	`7`	`+ "spack": "6812713cf470b473a607f0de0e8e1cf53f804fb7",`
	`8`	`+ "spack-config": "2024.03.22"`
	`9`	`+ },`
	`10`	`+ "0.22": {`
	`11`	`+ "spack": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d",`
	`12`	`+ "spack-config": "2024.07.05"`
`9`	`13`	`}`
`10`	`14`	`},`
`11`	`15`	`"Prerelease": {`
`12`		`- "spack": {`
`13`		`- "0.22": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d"`
	`16`	`+ "0.22": {`
	`17`	`+ "spack": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d",`
	`18`	`+ "spack-config": "2024.07.05"`
`14`	`19`	`}`
`15`	`20`	`}`
`16`	`21`	`}`
`17`	`22`	`}`
`18`		`-}`
	`23`	`+}`