From 57a77551b0f9e0d3140577aadb0865479d84738b Mon Sep 17 00:00:00 2001 From: flmeyer Date: Mon, 8 May 2023 17:00:05 +0200 Subject: [PATCH 01/10] Enable support for GitHub Enterprise Server --- languageserver/src/client.ts | 5 +++-- languageserver/src/connection.ts | 2 +- languageserver/src/initializationOptions.ts | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/languageserver/src/client.ts b/languageserver/src/client.ts index de54554..ac0aa61 100644 --- a/languageserver/src/client.ts +++ b/languageserver/src/client.ts @@ -1,8 +1,9 @@ import {Octokit} from "@octokit/rest"; -export function getClient(token: string, userAgent?: string): Octokit { +export function getClient(token: string, userAgent?: string, apiUrl?: string): Octokit { return new Octokit({ auth: token, - userAgent: userAgent || `GitHub Actions Language Server` + userAgent: userAgent || `GitHub Actions Language Server`, + baseUrl: apiUrl }); } diff --git a/languageserver/src/connection.ts b/languageserver/src/connection.ts index 274923a..c5c5f5f 100644 --- a/languageserver/src/connection.ts +++ b/languageserver/src/connection.ts @@ -51,7 +51,7 @@ export function initConnection(connection: Connection) { const options = params.initializationOptions as InitializationOptions; if (options.sessionToken) { - client = getClient(options.sessionToken, options.userAgent); + client = getClient(options.sessionToken, options.userAgent, options.githubApiUrl); } if (options.repos) { diff --git a/languageserver/src/initializationOptions.ts b/languageserver/src/initializationOptions.ts index abc1547..00e23fc 100644 --- a/languageserver/src/initializationOptions.ts +++ b/languageserver/src/initializationOptions.ts @@ -23,6 +23,11 @@ export interface InitializationOptions { * Desired log level */ logLevel?: LogLevel; + + /** + * If a GitHub Enterprise Server should be used, the URL of the API endpoint, eg "https://ghe.my-company.com/api/v3" + */ + githubApiUrl?: string; } export interface RepositoryContext { From 468b68840b16cfd319c35a2879eb34e6f359cad6 Mon Sep 17 00:00:00 2001 From: flmeyer Date: Fri, 12 May 2023 22:42:09 +0200 Subject: [PATCH 02/10] Add try-catch to avoid failing requests On GHES servers below version 3.8, the variables context is unavailable, resulting in 404 errors when calling the corresponding endpoint. --- .../src/context-providers/variables.ts | 87 ++++++++++--------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/languageserver/src/context-providers/variables.ts b/languageserver/src/context-providers/variables.ts index 92e5d4c..345bb85 100644 --- a/languageserver/src/context-providers/variables.ts +++ b/languageserver/src/context-providers/variables.ts @@ -2,9 +2,10 @@ import {data, DescriptionDictionary} from "@actions/expressions"; import {Pair} from "@actions/expressions/data/expressiondata"; import {StringData} from "@actions/expressions/data/index"; import {WorkflowContext} from "@actions/languageservice/context/workflow-context"; -import {warn} from "@actions/languageservice/log"; +import {log, warn} from "@actions/languageservice/log"; import {isMapping, isString} from "@actions/workflow-parser"; import {Octokit} from "@octokit/rest"; +import {RequestError} from "@octokit/types"; import {RepositoryContext} from "../initializationOptions"; import {TTLCache} from "../utils/cache"; @@ -42,50 +43,58 @@ export async function getVariables( } const variablesContext = defaultContext || new DescriptionDictionary(); - const variables = await getRemoteVariables(octokit, cache, repo, environmentName); + try { + const variables = await getRemoteVariables(octokit, cache, repo, environmentName); - // Build combined map of variables - const variablesMap = new Map< - string, - { - key: string; - value: data.StringData; - description?: string; - } - >(); + // Build combined map of variables + const variablesMap = new Map< + string, + { + key: string; + value: data.StringData; + description?: string; + } + >(); - variables.organizationVariables.forEach(variable => - variablesMap.set(variable.key.toLowerCase(), { - key: variable.key, - value: new data.StringData(variable.value.coerceString()), - description: `${variable.value.coerceString()} - Organization variable` - }) - ); + variables.organizationVariables.forEach(variable => + variablesMap.set(variable.key.toLowerCase(), { + key: variable.key, + value: new data.StringData(variable.value.coerceString()), + description: `${variable.value.coerceString()} - Organization variable` + }) + ); - // Override org variables with repo variables - variables.repoVariables.forEach(variable => - variablesMap.set(variable.key.toLowerCase(), { - key: variable.key, - value: new data.StringData(variable.value.coerceString()), - description: `${variable.value.coerceString()} - Repository variable` - }) - ); + // Override org variables with repo variables + variables.repoVariables.forEach(variable => + variablesMap.set(variable.key.toLowerCase(), { + key: variable.key, + value: new data.StringData(variable.value.coerceString()), + description: `${variable.value.coerceString()} - Repository variable` + }) + ); - // Override repo variables with environment veriables (if defined) - variables.environmentVariables.forEach(variable => - variablesMap.set(variable.key.toLowerCase(), { - key: variable.key, - value: new data.StringData(variable.value.coerceString()), - description: `${variable.value.coerceString()} - Variable for environment \`${environmentName || ""}\`` - }) - ); + // Override repo variables with environment veriables (if defined) + variables.environmentVariables.forEach(variable => + variablesMap.set(variable.key.toLowerCase(), { + key: variable.key, + value: new data.StringData(variable.value.coerceString()), + description: `${variable.value.coerceString()} - Variable for environment \`${environmentName || ""}\`` + }) + ); - // Sort variables by key and add to context - Array.from(variablesMap.values()) - .sort((a, b) => a.key.localeCompare(b.key)) - .forEach(variable => variablesContext?.add(variable.key, variable.value, variable.description)); + // Sort variables by key and add to context + Array.from(variablesMap.values()) + .sort((a, b) => a.key.localeCompare(b.key)) + .forEach(variable => variablesContext?.add(variable.key, variable.value, variable.description)); - return variablesContext; + return variablesContext; + } catch (e: any) { + const requestError: RequestError = e; + if (requestError.name == "HttpError" && requestError.status == 404) { + log("Failure to request variables. Ignore if you're using GitHub Enterprise Server below version 3.8"); + return variablesContext; + } else throw e; + } } export async function getRemoteVariables( From 41436c657094f18fa3c34c46bc2bbeee88403d0d Mon Sep 17 00:00:00 2001 From: flmeyer Date: Fri, 19 May 2023 16:34:58 +0200 Subject: [PATCH 03/10] Use correct RequestError class --- languageserver/src/context-providers/variables.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/languageserver/src/context-providers/variables.ts b/languageserver/src/context-providers/variables.ts index 345bb85..ef32c78 100644 --- a/languageserver/src/context-providers/variables.ts +++ b/languageserver/src/context-providers/variables.ts @@ -5,7 +5,7 @@ import {WorkflowContext} from "@actions/languageservice/context/workflow-context import {log, warn} from "@actions/languageservice/log"; import {isMapping, isString} from "@actions/workflow-parser"; import {Octokit} from "@octokit/rest"; -import {RequestError} from "@octokit/types"; +import {RequestError} from "@octokit/request-error"; import {RepositoryContext} from "../initializationOptions"; import {TTLCache} from "../utils/cache"; @@ -88,9 +88,9 @@ export async function getVariables( .forEach(variable => variablesContext?.add(variable.key, variable.value, variable.description)); return variablesContext; - } catch (e: any) { - const requestError: RequestError = e; - if (requestError.name == "HttpError" && requestError.status == 404) { + } catch (e) { + if (!(e instanceof RequestError)) throw e; + if (e.name == "HttpError" && e.status == 404) { log("Failure to request variables. Ignore if you're using GitHub Enterprise Server below version 3.8"); return variablesContext; } else throw e; From b912482163779d561c5d624d3013a3fb7f011752 Mon Sep 17 00:00:00 2001 From: Olfi01 Date: Thu, 25 May 2023 00:57:30 +0200 Subject: [PATCH 04/10] Apply suggestions from code review Changed parameter naming to match general pattern Co-authored-by: Christopher Schleiden --- languageserver/src/connection.ts | 2 +- languageserver/src/initializationOptions.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languageserver/src/connection.ts b/languageserver/src/connection.ts index c5c5f5f..90b139b 100644 --- a/languageserver/src/connection.ts +++ b/languageserver/src/connection.ts @@ -51,7 +51,7 @@ export function initConnection(connection: Connection) { const options = params.initializationOptions as InitializationOptions; if (options.sessionToken) { - client = getClient(options.sessionToken, options.userAgent, options.githubApiUrl); + client = getClient(options.sessionToken, options.userAgent, options.gitHubApiUrl); } if (options.repos) { diff --git a/languageserver/src/initializationOptions.ts b/languageserver/src/initializationOptions.ts index 00e23fc..59ef462 100644 --- a/languageserver/src/initializationOptions.ts +++ b/languageserver/src/initializationOptions.ts @@ -27,7 +27,7 @@ export interface InitializationOptions { /** * If a GitHub Enterprise Server should be used, the URL of the API endpoint, eg "https://ghe.my-company.com/api/v3" */ - githubApiUrl?: string; + gitHubApiUrl?: string; } export interface RepositoryContext { From 26da52bdf88c43bfdc21087091190f0f8115800c Mon Sep 17 00:00:00 2001 From: Felipe Suero <85468376+felipesu19@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:28:36 -0400 Subject: [PATCH 05/10] Update lerna.json The current version of lerna doesn't use useWorkspaces anymore, defaulting to using the workspace config if one exists: ``` ECONFIGWORKSPACES The "useWorkspaces" option has been removed. By default lerna will resolve your packages using your package manager's workspaces configuration. Alternatively, you can manually provide a list of package globs to be used instead via the "packages" option in lerna.json. ``` --- lerna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lerna.json b/lerna.json index 22c90fc..41578f4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "useWorkspaces": true, "version": "0.3.5" } From 833b6fcac52bd541db9b868abd25c39a2d050450 Mon Sep 17 00:00:00 2001 From: Felipe Suero Date: Wed, 14 Jun 2023 12:42:36 -0400 Subject: [PATCH 06/10] Explicitly state packages to upgrade --- lerna-debug.log | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ lerna.json | 8 ++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 lerna-debug.log diff --git a/lerna-debug.log b/lerna-debug.log new file mode 100644 index 0000000..22b8b5f --- /dev/null +++ b/lerna-debug.log @@ -0,0 +1,57 @@ +0 silly argv { +0 silly argv _: [ 'version' ], +0 silly argv yes: true, +0 silly argv y: true, +0 silly argv push: false, +0 silly argv 'git-tag-version': false, +0 silly argv gitTagVersion: false, +0 silly argv 'force-publish': true, +0 silly argv forcePublish: true, +0 silly argv lernaVersion: '7.0.1', +0 silly argv '$0': '/Users/fsuero/.npm/_npx/d5cad42883f80c04/node_modules/.bin/lerna', +0 silly argv bump: '0.3.6' +0 silly argv } +1 notice cli v7.0.1 +2 verbose packageConfigs Explicit "packages" configuration found in lerna.json. Resolving packages using the configured glob(s): ["expressions","workflow-parser","languageservice","languageserver"] +3 verbose rootPath /Users/fsuero/github/languageservices +4 info current version 0.3.5 +5 notice FYI git repository validation has been skipped, please ensure your version bumps are correct +6 silly hasTags +7 verbose hasTags true +8 silly git-describe.sync "cd7fabe-dirty" => {"refCount":"1067","sha":"cd7fabe","isDirty":true} +9 warn force-publish all packages +10 info Assuming all packages changed +11 verbose updated @actions/expressions +12 verbose updated @actions/languageserver +13 verbose updated @actions/languageservice +14 verbose updated @actions/workflow-parser +15 warn version Skipping working tree validation, proceed at your own risk +16 info auto-confirmed +17 info execute Skipping git tag/commit +18 info execute Skipping git push +19 info execute Skipping releases +20 silly lifecycle No script for "preversion" in "actions-languageservices", continuing +21 silly lifecycle No script for "preversion" in "@actions/expressions", continuing +22 verbose version @actions/expressions has no lockfile. Skipping lockfile update. +23 silly lifecycle No script for "version" in "@actions/expressions", continuing +24 silly lifecycle No script for "preversion" in "@actions/workflow-parser", continuing +25 verbose version @actions/workflow-parser has no lockfile. Skipping lockfile update. +26 silly lifecycle No script for "version" in "@actions/workflow-parser", continuing +27 silly lifecycle No script for "preversion" in "@actions/languageservice", continuing +28 verbose version @actions/languageservice has no lockfile. Skipping lockfile update. +29 silly lifecycle No script for "version" in "@actions/languageservice", continuing +30 silly lifecycle No script for "preversion" in "@actions/languageserver", continuing +31 verbose version @actions/languageserver has no lockfile. Skipping lockfile update. +32 silly lifecycle No script for "version" in "@actions/languageserver", continuing +33 verbose version Updating root package-lock.json +34 error Error: Command failed with exit code 1: npm install --package-lock-only --ignore-scripts +34 error npm ERR! code ETARGET +34 error npm ERR! notarget No matching version found for @actions/languageservice@^0.3.6. +34 error npm ERR! notarget In most cases you or one of your dependencies are requesting +34 error npm ERR! notarget a package version that doesn't exist. +34 error +34 error npm ERR! A complete log of this run can be found in: +34 error npm ERR! /Users/fsuero/.npm/_logs/2023-06-14T16_41_34_046Z-debug.log +34 error at makeError (/Users/fsuero/.npm/_npx/d5cad42883f80c04/node_modules/execa/lib/error.js:59:11) +34 error at handlePromise (/Users/fsuero/.npm/_npx/d5cad42883f80c04/node_modules/execa/index.js:114:26) +34 error at processTicksAndRejections (node:internal/process/task_queues:96:5) diff --git a/lerna.json b/lerna.json index 41578f4..462ed5c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,10 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", + "packages": [ + "expressions", + "workflow-parser", + "languageservice", + "languageserver" + ], "version": "0.3.5" -} +} \ No newline at end of file From 12d28370dc95cc4a883ec08ef52e0d4e1a968c24 Mon Sep 17 00:00:00 2001 From: Felipe Suero Date: Wed, 14 Jun 2023 12:42:49 -0400 Subject: [PATCH 07/10] Explicitly state packages to upgrade --- lerna-debug.log | 57 ------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 lerna-debug.log diff --git a/lerna-debug.log b/lerna-debug.log deleted file mode 100644 index 22b8b5f..0000000 --- a/lerna-debug.log +++ /dev/null @@ -1,57 +0,0 @@ -0 silly argv { -0 silly argv _: [ 'version' ], -0 silly argv yes: true, -0 silly argv y: true, -0 silly argv push: false, -0 silly argv 'git-tag-version': false, -0 silly argv gitTagVersion: false, -0 silly argv 'force-publish': true, -0 silly argv forcePublish: true, -0 silly argv lernaVersion: '7.0.1', -0 silly argv '$0': '/Users/fsuero/.npm/_npx/d5cad42883f80c04/node_modules/.bin/lerna', -0 silly argv bump: '0.3.6' -0 silly argv } -1 notice cli v7.0.1 -2 verbose packageConfigs Explicit "packages" configuration found in lerna.json. Resolving packages using the configured glob(s): ["expressions","workflow-parser","languageservice","languageserver"] -3 verbose rootPath /Users/fsuero/github/languageservices -4 info current version 0.3.5 -5 notice FYI git repository validation has been skipped, please ensure your version bumps are correct -6 silly hasTags -7 verbose hasTags true -8 silly git-describe.sync "cd7fabe-dirty" => {"refCount":"1067","sha":"cd7fabe","isDirty":true} -9 warn force-publish all packages -10 info Assuming all packages changed -11 verbose updated @actions/expressions -12 verbose updated @actions/languageserver -13 verbose updated @actions/languageservice -14 verbose updated @actions/workflow-parser -15 warn version Skipping working tree validation, proceed at your own risk -16 info auto-confirmed -17 info execute Skipping git tag/commit -18 info execute Skipping git push -19 info execute Skipping releases -20 silly lifecycle No script for "preversion" in "actions-languageservices", continuing -21 silly lifecycle No script for "preversion" in "@actions/expressions", continuing -22 verbose version @actions/expressions has no lockfile. Skipping lockfile update. -23 silly lifecycle No script for "version" in "@actions/expressions", continuing -24 silly lifecycle No script for "preversion" in "@actions/workflow-parser", continuing -25 verbose version @actions/workflow-parser has no lockfile. Skipping lockfile update. -26 silly lifecycle No script for "version" in "@actions/workflow-parser", continuing -27 silly lifecycle No script for "preversion" in "@actions/languageservice", continuing -28 verbose version @actions/languageservice has no lockfile. Skipping lockfile update. -29 silly lifecycle No script for "version" in "@actions/languageservice", continuing -30 silly lifecycle No script for "preversion" in "@actions/languageserver", continuing -31 verbose version @actions/languageserver has no lockfile. Skipping lockfile update. -32 silly lifecycle No script for "version" in "@actions/languageserver", continuing -33 verbose version Updating root package-lock.json -34 error Error: Command failed with exit code 1: npm install --package-lock-only --ignore-scripts -34 error npm ERR! code ETARGET -34 error npm ERR! notarget No matching version found for @actions/languageservice@^0.3.6. -34 error npm ERR! notarget In most cases you or one of your dependencies are requesting -34 error npm ERR! notarget a package version that doesn't exist. -34 error -34 error npm ERR! A complete log of this run can be found in: -34 error npm ERR! /Users/fsuero/.npm/_logs/2023-06-14T16_41_34_046Z-debug.log -34 error at makeError (/Users/fsuero/.npm/_npx/d5cad42883f80c04/node_modules/execa/lib/error.js:59:11) -34 error at handlePromise (/Users/fsuero/.npm/_npx/d5cad42883f80c04/node_modules/execa/index.js:114:26) -34 error at processTicksAndRejections (node:internal/process/task_queues:96:5) From af5dd4b91e8fabeacb5836128c487d047eb22f0d Mon Sep 17 00:00:00 2001 From: Felipe Suero Date: Wed, 14 Jun 2023 12:43:13 -0400 Subject: [PATCH 08/10] update gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ba6e0dc..3609de4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ */node_modules */dist - +lerna-debug.log node_modules .DS_Store \ No newline at end of file From 5de89b0f8e158d19ed8758e046a851ba779bea75 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 14 Jun 2023 17:21:25 +0000 Subject: [PATCH 09/10] Release extension version 0.3.6 --- expressions/package.json | 2 +- languageserver/package.json | 6 +++--- languageservice/package.json | 6 +++--- lerna.json | 4 ++-- package-lock.json | 18 +++++++++--------- workflow-parser/package.json | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/expressions/package.json b/expressions/package.json index 8f14626..53700d0 100755 --- a/expressions/package.json +++ b/expressions/package.json @@ -1,6 +1,6 @@ { "name": "@actions/expressions", - "version": "0.3.5", + "version": "0.3.6", "license": "MIT", "type": "module", "source": "./src/index.ts", diff --git a/languageserver/package.json b/languageserver/package.json index a9f8e9e..e38a628 100644 --- a/languageserver/package.json +++ b/languageserver/package.json @@ -1,6 +1,6 @@ { "name": "@actions/languageserver", - "version": "0.3.5", + "version": "0.3.6", "description": "Language server for GitHub Actions", "license": "MIT", "type": "module", @@ -43,8 +43,8 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@actions/languageservice": "^0.3.5", - "@actions/workflow-parser": "^0.3.5", + "@actions/languageservice": "^0.3.6", + "@actions/workflow-parser": "^0.3.6", "@octokit/rest": "^19.0.7", "@octokit/types": "^9.0.0", "vscode-languageserver": "^8.0.2", diff --git a/languageservice/package.json b/languageservice/package.json index 8cb10a6..3264eb6 100644 --- a/languageservice/package.json +++ b/languageservice/package.json @@ -1,6 +1,6 @@ { "name": "@actions/languageservice", - "version": "0.3.5", + "version": "0.3.6", "description": "Language service for GitHub Actions", "license": "MIT", "type": "module", @@ -44,8 +44,8 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@actions/expressions": "^0.3.5", - "@actions/workflow-parser": "^0.3.5", + "@actions/expressions": "^0.3.6", + "@actions/workflow-parser": "^0.3.6", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "vscode-uri": "^3.0.7", diff --git a/lerna.json b/lerna.json index 462ed5c..a3751df 100644 --- a/lerna.json +++ b/lerna.json @@ -6,5 +6,5 @@ "languageservice", "languageserver" ], - "version": "0.3.5" -} \ No newline at end of file + "version": "0.3.6" +} diff --git a/package-lock.json b/package-lock.json index 54924a3..763f8ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -135,7 +135,7 @@ }, "expressions": { "name": "@actions/expressions", - "version": "0.3.5", + "version": "0.3.6", "license": "MIT", "devDependencies": { "@types/jest": "^29.0.3", @@ -395,11 +395,11 @@ }, "languageserver": { "name": "@actions/languageserver", - "version": "0.3.5", + "version": "0.3.6", "license": "MIT", "dependencies": { - "@actions/languageservice": "^0.3.5", - "@actions/workflow-parser": "^0.3.5", + "@actions/languageservice": "^0.3.6", + "@actions/workflow-parser": "^0.3.6", "@octokit/rest": "^19.0.7", "@octokit/types": "^9.0.0", "vscode-languageserver": "^8.0.2", @@ -678,11 +678,11 @@ }, "languageservice": { "name": "@actions/languageservice", - "version": "0.3.5", + "version": "0.3.6", "license": "MIT", "dependencies": { - "@actions/expressions": "^0.3.5", - "@actions/workflow-parser": "^0.3.5", + "@actions/expressions": "^0.3.6", + "@actions/workflow-parser": "^0.3.6", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "vscode-uri": "^3.0.7", @@ -11720,10 +11720,10 @@ }, "workflow-parser": { "name": "@actions/workflow-parser", - "version": "0.3.5", + "version": "0.3.6", "license": "MIT", "dependencies": { - "@actions/expressions": "^0.3.5", + "@actions/expressions": "^0.3.6", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, diff --git a/workflow-parser/package.json b/workflow-parser/package.json index a91e6c5..c06c835 100644 --- a/workflow-parser/package.json +++ b/workflow-parser/package.json @@ -1,6 +1,6 @@ { "name": "@actions/workflow-parser", - "version": "0.3.5", + "version": "0.3.6", "license": "MIT", "type": "module", "source": "./src/index.ts", @@ -43,7 +43,7 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@actions/expressions": "^0.3.5", + "@actions/expressions": "^0.3.6", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, From cf2d9cd0b9ee39836ac7197d6cc01183837674d8 Mon Sep 17 00:00:00 2001 From: Yukai Chou Date: Fri, 7 Jul 2023 16:21:08 +0800 Subject: [PATCH 10/10] Fix typos in workflow schema --- workflow-parser/src/workflow-v1.0.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow-parser/src/workflow-v1.0.json b/workflow-parser/src/workflow-v1.0.json index f990beb..b0be097 100644 --- a/workflow-parser/src/workflow-v1.0.json +++ b/workflow-parser/src/workflow-v1.0.json @@ -1183,7 +1183,7 @@ ] }, "workflow-run-activity": { - "description": "The types of workflow run activity that trigger the workflow. Suupported activity types: `completed`, `requested`, `in_progress`.", + "description": "The types of workflow run activity that trigger the workflow. Supported activity types: `completed`, `requested`, `in_progress`.", "one-of": [ "workflow-run-activity-type", "workflow-run-activity-types" @@ -2489,7 +2489,7 @@ "string": { "require-non-empty": true }, - "description": "Use `shell` to override the default shell settings in the runner's operating system. You can use built-in shell keywords, or you can define a custom set of shell options. The shell command that is run internally executes a temporary file that contains the comands specified in `run`." + "description": "Use `shell` to override the default shell settings in the runner's operating system. You can use built-in shell keywords, or you can define a custom set of shell options. The shell command that is run internally executes a temporary file that contains the commands specified in `run`." }, "working-directory": { "string": {