From 99d82473aeabd930ff982c609a89c09be4a50d3d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Feb 2023 22:11:28 +0000 Subject: [PATCH 1/4] v0.1.119 --- actions-expressions/package.json | 2 +- actions-languageserver/package.json | 6 ++--- actions-languageservice/package.json | 6 ++--- actions-workflow-parser/package.json | 4 ++-- browser-playground/package.json | 4 ++-- lerna.json | 2 +- package-lock.json | 34 ++++++++++++++-------------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/actions-expressions/package.json b/actions-expressions/package.json index 59ce57d..bc5834f 100755 --- a/actions-expressions/package.json +++ b/actions-expressions/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-expressions", - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "type": "module", "source": "./src/index.ts", diff --git a/actions-languageserver/package.json b/actions-languageserver/package.json index 505e242..abae537 100644 --- a/actions-languageserver/package.json +++ b/actions-languageserver/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-languageserver", - "version": "0.1.118", + "version": "0.1.119", "description": "Language server for GitHub Actions", "license": "MIT", "type": "module", @@ -38,8 +38,8 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@github/actions-languageservice": "^0.1.118", - "@github/actions-workflow-parser": "^0.1.118", + "@github/actions-languageservice": "^0.1.119", + "@github/actions-workflow-parser": "^0.1.119", "@octokit/rest": "^19.0.7", "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", diff --git a/actions-languageservice/package.json b/actions-languageservice/package.json index b19d16d..72bd7c2 100644 --- a/actions-languageservice/package.json +++ b/actions-languageservice/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-languageservice", - "version": "0.1.118", + "version": "0.1.119", "description": "Language service for GitHub Actions", "license": "MIT", "type": "module", @@ -38,8 +38,8 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@github/actions-expressions": "^0.1.118", - "@github/actions-workflow-parser": "^0.1.118", + "@github/actions-expressions": "^0.1.119", + "@github/actions-workflow-parser": "^0.1.119", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "yaml": "^2.1.1" diff --git a/actions-workflow-parser/package.json b/actions-workflow-parser/package.json index 784b2ec..c21a549 100644 --- a/actions-workflow-parser/package.json +++ b/actions-workflow-parser/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-workflow-parser", - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "type": "module", "source": "./src/index.ts", @@ -40,7 +40,7 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@github/actions-expressions": "^0.1.118", + "@github/actions-expressions": "^0.1.119", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, diff --git a/browser-playground/package.json b/browser-playground/package.json index 93567c9..cf63c34 100644 --- a/browser-playground/package.json +++ b/browser-playground/package.json @@ -1,12 +1,12 @@ { "name": "browser-playground", - "version": "0.1.118", + "version": "0.1.119", "description": "", "private": true, "main": "index.js", "type": "module", "dependencies": { - "@github/actions-languageserver": "^0.1.118", + "@github/actions-languageserver": "^0.1.119", "monaco-editor-webpack-plugin": "^7.0.1", "monaco-editor-workers": "^0.34.2", "monaco-languageclient": "^4.0.3", diff --git a/lerna.json b/lerna.json index e49754b..d353ad9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "0.1.118" + "version": "0.1.119" } diff --git a/package-lock.json b/package-lock.json index 6e3c44f..46094bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ }, "actions-expressions": { "name": "@github/actions-expressions", - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "devDependencies": { "@types/jest": "^29.0.3", @@ -34,11 +34,11 @@ }, "actions-languageserver": { "name": "@github/actions-languageserver", - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "dependencies": { - "@github/actions-languageservice": "^0.1.118", - "@github/actions-workflow-parser": "^0.1.118", + "@github/actions-languageservice": "^0.1.119", + "@github/actions-workflow-parser": "^0.1.119", "@octokit/rest": "^19.0.7", "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", @@ -59,11 +59,11 @@ }, "actions-languageservice": { "name": "@github/actions-languageservice", - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "dependencies": { - "@github/actions-expressions": "^0.1.118", - "@github/actions-workflow-parser": "^0.1.118", + "@github/actions-expressions": "^0.1.119", + "@github/actions-workflow-parser": "^0.1.119", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "yaml": "^2.1.1" @@ -82,10 +82,10 @@ }, "actions-workflow-parser": { "name": "@github/actions-workflow-parser", - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "dependencies": { - "@github/actions-expressions": "^0.1.118", + "@github/actions-expressions": "^0.1.119", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, @@ -105,10 +105,10 @@ } }, "browser-playground": { - "version": "0.1.118", + "version": "0.1.119", "license": "MIT", "dependencies": { - "@github/actions-languageserver": "^0.1.118", + "@github/actions-languageserver": "^0.1.119", "monaco-editor-webpack-plugin": "^7.0.1", "monaco-editor-workers": "^0.34.2", "monaco-languageclient": "^4.0.3", @@ -14570,8 +14570,8 @@ "@github/actions-languageserver": { "version": "file:actions-languageserver", "requires": { - "@github/actions-languageservice": "^0.1.118", - "@github/actions-workflow-parser": "^0.1.118", + "@github/actions-languageservice": "^0.1.119", + "@github/actions-workflow-parser": "^0.1.119", "@octokit/rest": "^19.0.7", "@types/jest": "^29.0.3", "fetch-mock": "^9.11.0", @@ -14588,8 +14588,8 @@ "@github/actions-languageservice": { "version": "file:actions-languageservice", "requires": { - "@github/actions-expressions": "^0.1.118", - "@github/actions-workflow-parser": "^0.1.118", + "@github/actions-expressions": "^0.1.119", + "@github/actions-workflow-parser": "^0.1.119", "@types/jest": "^29.0.3", "jest": "^29.0.3", "prettier": "^2.8.3", @@ -14604,7 +14604,7 @@ "@github/actions-workflow-parser": { "version": "file:actions-workflow-parser", "requires": { - "@github/actions-expressions": "^0.1.118", + "@github/actions-expressions": "^0.1.119", "@types/jest": "^29.0.3", "@typescript-eslint/eslint-plugin": "^5.40.0", "@typescript-eslint/parser": "^5.40.0", @@ -17562,7 +17562,7 @@ "browser-playground": { "version": "file:browser-playground", "requires": { - "@github/actions-languageserver": "^0.1.118", + "@github/actions-languageserver": "^0.1.119", "css-loader": "^6.7.2", "monaco-editor-webpack-plugin": "^7.0.1", "monaco-editor-workers": "^0.34.2", From ce19439ed82666bc5dd76e5eb8e70a98d179b600 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Mon, 6 Feb 2023 17:11:46 -0500 Subject: [PATCH 2/4] Remove unnecessary extra event conversion --- .../src/model/converter/referencedWorkflow.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/actions-workflow-parser/src/model/converter/referencedWorkflow.ts b/actions-workflow-parser/src/model/converter/referencedWorkflow.ts index e557d82..0ac6f91 100644 --- a/actions-workflow-parser/src/model/converter/referencedWorkflow.ts +++ b/actions-workflow-parser/src/model/converter/referencedWorkflow.ts @@ -2,7 +2,6 @@ import {TemplateContext} from "../../templates/template-context"; import {TemplateToken} from "../../templates/tokens"; import {TokenType} from "../../templates/tokens/types"; import {ReusableWorkflowJob} from "../workflow-template"; -import {convertOn} from "./events"; import {handleTemplateTokenErrors} from "./handle-errors"; import {convertJobs} from "./jobs"; @@ -29,15 +28,6 @@ export function convertReferencedWorkflow( } } } - - if (!onToken) { - return; - } - - const events = convertOn(context, onToken); - if (events.workflow_call === undefined) { - context.error(onToken, "workflow_call key is not defined in the referenced workflow."); - } } function convertReferencedWorkflowOn(context: TemplateContext, on: TemplateToken, job: ReusableWorkflowJob) { From 8f826c59f856e34563aeb6668626b43cba739fac Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Mon, 6 Feb 2023 17:20:30 -0500 Subject: [PATCH 3/4] Fix tests that now require `await` --- actions-languageserver/src/context-providers/steps.test.ts | 4 ++-- .../src/description-providers/action-input.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actions-languageserver/src/context-providers/steps.test.ts b/actions-languageserver/src/context-providers/steps.test.ts index 0120216..019a612 100644 --- a/actions-languageserver/src/context-providers/steps.test.ts +++ b/actions-languageserver/src/context-providers/steps.test.ts @@ -56,7 +56,7 @@ const actionMetadata = { }; it("returns default context when job is undefined", async () => { - const workflowContext = createWorkflowContext(workflow, undefined); + const workflowContext = await createWorkflowContext(workflow, undefined); const defaultContext = getDefaultStepsContext(workflowContext); const stepsContext = await getStepsContext(new Octokit(), new TTLCache(), defaultContext, workflowContext); @@ -68,7 +68,7 @@ it("adds action outputs", async () => { .sandbox() .getOnce("https://api.github.com/repos/actions/cache/contents/action.yml?ref=v3", actionMetadata); - const workflowContext = createWorkflowContext(workflow, "build"); + const workflowContext = await createWorkflowContext(workflow, "build"); const defaultContext = getDefaultStepsContext(workflowContext); const stepsContext = await getStepsContext( diff --git a/actions-languageserver/src/description-providers/action-input.test.ts b/actions-languageserver/src/description-providers/action-input.test.ts index d1bd0eb..9912982 100644 --- a/actions-languageserver/src/description-providers/action-input.test.ts +++ b/actions-languageserver/src/description-providers/action-input.test.ts @@ -60,7 +60,7 @@ const actionMetadata = { }; async function getDescription(input: string, mock: fetchMock.FetchMockSandbox) { - const workflowContext = createWorkflowContext(workflow, "build", 0); + const workflowContext = await createWorkflowContext(workflow, "build", 0); return await getActionInputDescription( new Octokit({ From 0f01fae09a6987f524843c22b7c13803e4bbfc7b Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Feb 2023 22:25:56 +0000 Subject: [PATCH 4/4] v0.1.120 --- actions-expressions/package.json | 2 +- actions-languageserver/package.json | 6 ++--- actions-languageservice/package.json | 6 ++--- actions-workflow-parser/package.json | 4 ++-- browser-playground/package.json | 4 ++-- lerna.json | 2 +- package-lock.json | 34 ++++++++++++++-------------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/actions-expressions/package.json b/actions-expressions/package.json index bc5834f..b50f792 100755 --- a/actions-expressions/package.json +++ b/actions-expressions/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-expressions", - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "type": "module", "source": "./src/index.ts", diff --git a/actions-languageserver/package.json b/actions-languageserver/package.json index abae537..5f8c2b3 100644 --- a/actions-languageserver/package.json +++ b/actions-languageserver/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-languageserver", - "version": "0.1.119", + "version": "0.1.120", "description": "Language server for GitHub Actions", "license": "MIT", "type": "module", @@ -38,8 +38,8 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@github/actions-languageservice": "^0.1.119", - "@github/actions-workflow-parser": "^0.1.119", + "@github/actions-languageservice": "^0.1.120", + "@github/actions-workflow-parser": "^0.1.120", "@octokit/rest": "^19.0.7", "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", diff --git a/actions-languageservice/package.json b/actions-languageservice/package.json index 72bd7c2..cb0cbc9 100644 --- a/actions-languageservice/package.json +++ b/actions-languageservice/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-languageservice", - "version": "0.1.119", + "version": "0.1.120", "description": "Language service for GitHub Actions", "license": "MIT", "type": "module", @@ -38,8 +38,8 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@github/actions-expressions": "^0.1.119", - "@github/actions-workflow-parser": "^0.1.119", + "@github/actions-expressions": "^0.1.120", + "@github/actions-workflow-parser": "^0.1.120", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "yaml": "^2.1.1" diff --git a/actions-workflow-parser/package.json b/actions-workflow-parser/package.json index c21a549..dec4584 100644 --- a/actions-workflow-parser/package.json +++ b/actions-workflow-parser/package.json @@ -1,6 +1,6 @@ { "name": "@github/actions-workflow-parser", - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "type": "module", "source": "./src/index.ts", @@ -40,7 +40,7 @@ "watch": "tsc --build tsconfig.build.json --watch" }, "dependencies": { - "@github/actions-expressions": "^0.1.119", + "@github/actions-expressions": "^0.1.120", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, diff --git a/browser-playground/package.json b/browser-playground/package.json index cf63c34..efd89a0 100644 --- a/browser-playground/package.json +++ b/browser-playground/package.json @@ -1,12 +1,12 @@ { "name": "browser-playground", - "version": "0.1.119", + "version": "0.1.120", "description": "", "private": true, "main": "index.js", "type": "module", "dependencies": { - "@github/actions-languageserver": "^0.1.119", + "@github/actions-languageserver": "^0.1.120", "monaco-editor-webpack-plugin": "^7.0.1", "monaco-editor-workers": "^0.34.2", "monaco-languageclient": "^4.0.3", diff --git a/lerna.json b/lerna.json index d353ad9..7e2a40a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "0.1.119" + "version": "0.1.120" } diff --git a/package-lock.json b/package-lock.json index 46094bd..ff5a9a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ }, "actions-expressions": { "name": "@github/actions-expressions", - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "devDependencies": { "@types/jest": "^29.0.3", @@ -34,11 +34,11 @@ }, "actions-languageserver": { "name": "@github/actions-languageserver", - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "dependencies": { - "@github/actions-languageservice": "^0.1.119", - "@github/actions-workflow-parser": "^0.1.119", + "@github/actions-languageservice": "^0.1.120", + "@github/actions-workflow-parser": "^0.1.120", "@octokit/rest": "^19.0.7", "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", @@ -59,11 +59,11 @@ }, "actions-languageservice": { "name": "@github/actions-languageservice", - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "dependencies": { - "@github/actions-expressions": "^0.1.119", - "@github/actions-workflow-parser": "^0.1.119", + "@github/actions-expressions": "^0.1.120", + "@github/actions-workflow-parser": "^0.1.120", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", "yaml": "^2.1.1" @@ -82,10 +82,10 @@ }, "actions-workflow-parser": { "name": "@github/actions-workflow-parser", - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "dependencies": { - "@github/actions-expressions": "^0.1.119", + "@github/actions-expressions": "^0.1.120", "cronstrue": "^2.21.0", "yaml": "^2.0.0-8" }, @@ -105,10 +105,10 @@ } }, "browser-playground": { - "version": "0.1.119", + "version": "0.1.120", "license": "MIT", "dependencies": { - "@github/actions-languageserver": "^0.1.119", + "@github/actions-languageserver": "^0.1.120", "monaco-editor-webpack-plugin": "^7.0.1", "monaco-editor-workers": "^0.34.2", "monaco-languageclient": "^4.0.3", @@ -14570,8 +14570,8 @@ "@github/actions-languageserver": { "version": "file:actions-languageserver", "requires": { - "@github/actions-languageservice": "^0.1.119", - "@github/actions-workflow-parser": "^0.1.119", + "@github/actions-languageservice": "^0.1.120", + "@github/actions-workflow-parser": "^0.1.120", "@octokit/rest": "^19.0.7", "@types/jest": "^29.0.3", "fetch-mock": "^9.11.0", @@ -14588,8 +14588,8 @@ "@github/actions-languageservice": { "version": "file:actions-languageservice", "requires": { - "@github/actions-expressions": "^0.1.119", - "@github/actions-workflow-parser": "^0.1.119", + "@github/actions-expressions": "^0.1.120", + "@github/actions-workflow-parser": "^0.1.120", "@types/jest": "^29.0.3", "jest": "^29.0.3", "prettier": "^2.8.3", @@ -14604,7 +14604,7 @@ "@github/actions-workflow-parser": { "version": "file:actions-workflow-parser", "requires": { - "@github/actions-expressions": "^0.1.119", + "@github/actions-expressions": "^0.1.120", "@types/jest": "^29.0.3", "@typescript-eslint/eslint-plugin": "^5.40.0", "@typescript-eslint/parser": "^5.40.0", @@ -17562,7 +17562,7 @@ "browser-playground": { "version": "file:browser-playground", "requires": { - "@github/actions-languageserver": "^0.1.119", + "@github/actions-languageserver": "^0.1.120", "css-loader": "^6.7.2", "monaco-editor-webpack-plugin": "^7.0.1", "monaco-editor-workers": "^0.34.2",