From 8a38101abbe77acb553e6a91fd3d535520101bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 26 Aug 2023 11:18:42 +0200 Subject: [PATCH 1/3] schemas: fix $id urls --- schemas/manifest.v2.schema.json | 2 +- schemas/tests.v1.schema.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/manifest.v2.schema.json b/schemas/manifest.v2.schema.json index f6a3a013..bb6f6b02 100644 --- a/schemas/manifest.v2.schema.json +++ b/schemas/manifest.v2.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://github.com/YunoHost/apps/blob/master/schemas/manifest.v2.schema.json", + "$id": "https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json", "title": "Yunohost app manifest.toml schema", "version": "0", diff --git a/schemas/tests.v1.schema.json b/schemas/tests.v1.schema.json index 6a170cac..ae49c2a7 100644 --- a/schemas/tests.v1.schema.json +++ b/schemas/tests.v1.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://github.com/YunoHost/apps/blob/master/schemas/tests.v1.schema.json", + "$id": "https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json", "title": "Yunohost app package tests.toml schema", "version": "0", From 6bb7a11d4dfda6bf5f6d511ea92a5435f20b0acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 26 Aug 2023 11:19:22 +0200 Subject: [PATCH 2/3] schema tests: fix: test_upgrade_from children are sha1, can start with a digit... --- schemas/tests.v1.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/tests.v1.schema.json b/schemas/tests.v1.schema.json index ae49c2a7..b354aacc 100644 --- a/schemas/tests.v1.schema.json +++ b/schemas/tests.v1.schema.json @@ -56,7 +56,7 @@ "required": [], "additionalProperties": false, "patternProperties": { - "^[a-z][a-z0-9_]*$": { + "^[a-z0-9_]*$": { "type": "object", "required": [], "additionalProperties": false, From 6bc0c2b28f2ca6130f1eeb59970f0989ec61d9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 26 Aug 2023 11:20:08 +0200 Subject: [PATCH 3/3] schema tests: fix: install_args children schema syntax was faulty --- schemas/tests.v1.schema.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/schemas/tests.v1.schema.json b/schemas/tests.v1.schema.json index b354aacc..e2aca8b6 100644 --- a/schemas/tests.v1.schema.json +++ b/schemas/tests.v1.schema.json @@ -21,12 +21,10 @@ "additionalProperties": false, "patternProperties": { "^[a-z][a-z0-9_]*$": { - "type": { - "anyOf": [ - {"type": "string"}, - {"type": "number"} - ] - } + "anyOf": [ + {"type": "string"}, + {"type": "number"} + ] } } },