Test prereqs, fix requireds

pgxn · Jul 2, 2024 · ec543f1 · ec543f1
1 parent af9ecfc
commit ec543f1
Show file tree

Hide file tree

Showing 7 changed files with 369 additions and 24 deletions.
diff --git a/schema/v1/bugtracker.schema.json b/schema/v1/bugtracker.schema.json
@@ -16,11 +16,7 @@
       "description": "An email address to which bug reports can be sent"
     }
   },
-  "anyOf": [
-    { "required": ["web"] },
-    { "required": ["mailto"] },
-    { "required": ["web", "mailto"] }
-  ],
+  "anyOf": [{ "required": ["web"] }, { "required": ["mailto"] }],
   "patternProperties": {
     "^[xX]_.": {
       "description": "Custom key"

diff --git a/schema/v1/no_index.schema.json b/schema/v1/no_index.schema.json
@@ -26,11 +26,7 @@
       }
     }
   },
-  "anyOf": [
-    { "required": ["file"] },
-    { "required": ["directory"] },
-    { "required": ["file", "directory"] }
-  ],
+  "anyOf": [{ "required": ["file"] }, { "required": ["directory"] }],
   "patternProperties": {
     "^[xX]_.": {
       "description": "Custom key"

diff --git a/schema/v1/prereq_phase.schema.json b/schema/v1/prereq_phase.schema.json
@@ -28,8 +28,12 @@
     }
   },
   "additionalProperties": false,
-  "minProperties": 1,
-  "$comment": "Really should require at least one of the named properties; this allows for a single _x property. Good enough for now.",
+  "anyOf": [
+    { "required": ["requires"] },
+    { "required": ["recommends"] },
+    { "required": ["suggests"] },
+    { "required": ["conflicts"] }
+  ],
   "examples": [
     {
       "requires": {

diff --git a/schema/v1/prereqs.schema.json b/schema/v1/prereqs.schema.json
@@ -26,8 +26,13 @@
       "description": "The develop phase’s prereqs are extensions needed to work on the distribution’s source code as its maintainer does. These tools might be needed to build a release tarball, to run maintainer-only tests, or to perform other tasks related to developing new versions of the distribution."
     }
   },
-  "minProperties": 1,
-  "$comment": "Really should require at least one of the named properties; this allows for a single _x property. Good enough for now.",
+  "anyOf": [
+    { "required": ["configure"] },
+    { "required": ["build"] },
+    { "required": ["test"] },
+    { "required": ["runtime"] },
+    { "required": ["develop"] }
+  ],
   "patternProperties": {
     "^[xX]_.": {
       "description": "Custom key"

diff --git a/schema/v1/repository.schema.json b/schema/v1/repository.schema.json
@@ -20,11 +20,7 @@
       "description": "a lowercase string indicating the VCS used."
     }
   },
-  "anyOf": [
-    { "required": ["url", "type"] },
-    { "required": ["web"] },
-    { "required": ["web", "url", "type"] }
-  ],
+  "anyOf": [{ "required": ["url", "type"] }, { "required": ["web"] }],
   "patternProperties": {
     "^[xX]_.": {
       "description": "Custom key"

diff --git a/schema/v1/resources.schema.json b/schema/v1/resources.schema.json
@@ -19,8 +19,11 @@
     }
   },
   "additionalProperties": false,
-  "minProperties": 1,
-  "$comment": "Really should require at least one of the named properties; this allows for a single _x property. Good enough for now.",
+  "anyOf": [
+    { "required": ["homepage"] },
+    { "required": ["bugtracker"] },
+    { "required": ["repository"] }
+  ],
   "examples": [
     {
       "homepage": "https://pgxn.org/",