diff --git a/__tests__/helpers/github-workflow-schema.json b/__tests__/helpers/github-workflow-schema.json index fd746836e..a60ccf055 100644 --- a/__tests__/helpers/github-workflow-schema.json +++ b/__tests__/helpers/github-workflow-schema.json @@ -363,79 +363,15 @@ "runs-on": { "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idruns-on", "description": "The type of machine to run the job on. The machine can be either a GitHub-hosted runner, or a self-hosted runner.", - "oneOf": [ + "anyOf": [ { "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#github-hosted-runners", - "type": "string", - "enum": [ - "macos-10.15", - "macos-11", - "macos-12", - "macos-12-xl", - "macos-13", - "macos-13-xl", - "macos-latest", - "macos-latest-xl", - "self-hosted", - "ubuntu-18.04", - "ubuntu-20.04", - "ubuntu-22.04", - "ubuntu-latest", - "ubuntu-latest-4-cores", - "ubuntu-latest-8-cores", - "ubuntu-latest-16-cores", - "windows-2019", - "windows-2022", - "windows-latest", - "windows-latest-8-cores" - ] + "type": "string" }, { "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#self-hosted-runners", "type": "array", - "anyOf": [ - { "items": [{ "const": "self-hosted" }], "minItems": 1, "additionalItems": { "type": "string" } }, - { - "items": [{ "const": "self-hosted" }, { "$ref": "#/definitions/machine" }], - "minItems": 2, - "additionalItems": { "type": "string" } - }, - { - "items": [{ "const": "self-hosted" }, { "$ref": "#/definitions/architecture" }], - "minItems": 2, - "additionalItems": { "type": "string" } - }, - { - "items": [ - { "const": "self-hosted" }, - { "$ref": "#/definitions/machine" }, - { "$ref": "#/definitions/architecture" } - ], - "minItems": 3, - "additionalItems": { "type": "string" } - }, - { - "items": [ - { "const": "self-hosted" }, - { "$ref": "#/definitions/architecture" }, - { "$ref": "#/definitions/machine" } - ], - "minItems": 3, - "additionalItems": { "type": "string" } - }, - { - "items": [{ "const": "linux" }], - "minItems": 2, - "maxItems": 2, - "additionalItems": { "type": "string" } - }, - { - "items": [{ "const": "windows" }], - "minItems": 2, - "maxItems": 2, - "additionalItems": { "type": "string" } - } - ] + "anyOf": [{ "items": [{ "type": "string" }], "minItems": 1 }] }, { "$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-runners-in-a-group", @@ -445,7 +381,8 @@ "labels": { "oneOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }] } } }, - { "$ref": "#/definitions/stringContainingExpressionSyntax" } + { "$ref": "#/definitions/stringContainingExpressionSyntax" }, + { "$ref": "#/definitions/expressionSyntax" } ] }, "environment": {