Merge pull request #223 from per1234/add-all-host

Add support for "all" host type in package index tool definition
arduino · Aug 4, 2021 · 8ec1138 · 8ec1138
2 parents b7d561a + f78016a
commit 8ec1138
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/etc/schemas/arduino-package-index-definitions-schema.json b/etc/schemas/arduino-package-index-definitions-schema.json
@@ -1369,6 +1369,9 @@
               "validHost": {
                 "$comment": "https://github.com/arduino/arduino-cli/blob/cdbebe98f895c18146ea2607cfb706d002b01191/arduino/cores/tools.go#L144-L155",
                 "anyOf": [
+                  {
+                    "pattern": "^all$"
+                  },
                   {
                     "pattern": "^arm.*-linux-gnueabihf$"
                   },

diff --git a/internal/project/packageindex/packageindexschemas_test.go b/internal/project/packageindex/packageindexschemas_test.go
@@ -487,6 +487,10 @@ func TestPattern(t *testing.T) {
 		{"/packages/0/tools/0/systems/0/size", "foo", compliancelevel.Specification, assert.True},
 		{"/packages/0/tools/0/systems/0/size", "foo", compliancelevel.Strict, assert.True},
 
+		{"/packages/0/tools/0/systems/0/host", "all", compliancelevel.Permissive, assert.False},
+		{"/packages/0/tools/0/systems/0/host", "all", compliancelevel.Specification, assert.False},
+		{"/packages/0/tools/0/systems/0/host", "all", compliancelevel.Strict, assert.False},
+
 		{"/packages/0/tools/0/systems/0/host", "arm-linux-gnueabihf", compliancelevel.Permissive, assert.False},
 		{"/packages/0/tools/0/systems/0/host", "arm-linux-gnueabihf", compliancelevel.Specification, assert.False},
 		{"/packages/0/tools/0/systems/0/host", "arm-linux-gnueabihf", compliancelevel.Strict, assert.False},

diff --git a/internal/rule/schema/schemadata/bindata.go b/internal/rule/schema/schemadata/bindata.go
@@ -3904,6 +3904,9 @@ var _arduinoPackageIndexDefinitionsSchemaJson = []byte(`{
               "validHost": {
                 "$comment": "https://github.com/arduino/arduino-cli/blob/cdbebe98f895c18146ea2607cfb706d002b01191/arduino/cores/tools.go#L144-L155",
                 "anyOf": [
+                  {
+                    "pattern": "^all$"
+                  },
                   {
                     "pattern": "^arm.*-linux-gnueabihf$"
                   },