actions/languageservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into elbrenn/called-secret-complete

Browse Source
This commit is contained in:
Beth Brennan
2023-03-07 16:44:25 -05:00
committed by GitHub
parent 87e3131958 19ad833610
commit de09e8771a
21 changed files with 363 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
workflow-parser/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@github/actions-workflow-parser",
"version": "0.1.157",
"version": "0.1.159",
"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.157",
"@github/actions-expressions": "^0.1.159",
"cronstrue": "^2.21.0",
"yaml": "^2.0.0-8"
},
workflow-parser/src/model/converter/job.ts
+14 -5
View File
@@ -1,6 +1,6 @@
import {TemplateContext} from "../../templates/template-context";
import {BasicExpressionToken, MappingToken, ScalarToken, StringToken, TemplateToken} from "../../templates/tokens";
import {isSequence, isString} from "../../templates/tokens/type-guards";
import {isMapping, isSequence, isString} from "../../templates/tokens/type-guards";
import {Step, WorkflowJob} from "../workflow-template";
import {convertConcurrency} from "./concurrency";
import {convertToJobContainer, convertToJobServices} from "./container";
@@ -38,7 +38,9 @@ export function convertJob(context: TemplateContext, jobKey: StringToken, token:
break;
case "env":
env = item.value.assertMapping("job env");
handleTemplateTokenErrors(item.value, context, undefined, () => {
env = item.value.assertMapping("job env");
});
break;
case "environment":
@@ -69,7 +71,9 @@ export function convertJob(context: TemplateContext, jobKey: StringToken, token:
}
case "outputs":
outputs = item.value.assertMapping("job outputs");
handleTemplateTokenErrors(item.value, context, undefined, () => {
outputs = item.value.assertMapping("job outputs");
});
break;
case "runs-on":
@@ -95,14 +99,19 @@ export function convertJob(context: TemplateContext, jobKey: StringToken, token:
break;
case "with":
workflowJobInputs = item.value.assertMapping("uses-with value");
handleTemplateTokenErrors(item.value, context, undefined, () => {
workflowJobInputs = item.value.assertMapping("uses-with value");
});
break;
case "secrets":
if (isString(item.value) && item.value.value === "inherit") {
inheritSecrets = true;
} else {
workflowJobSecrets = item.value.assertMapping("uses-secrets value");
handleTemplateTokenErrors(item.value, context, undefined, () => {
workflowJobSecrets = item.value.assertMapping("uses-secrets value");
});
}
break;
}
}