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

add scalar handling

Browse Source
This commit is contained in:
Felipe Suero
2023-04-11 13:54:53 -04:00
parent d58deaf097
commit 736dd1a66c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
workflow-parser/src/model/converter/steps.ts
+3 -1
View File
@@ -51,7 +51,7 @@ function convertStep(context: TemplateContext, idBuilder: IdBuilder, step: Templ
let id: StringToken | undefined; let id: StringToken | undefined;
let name: ScalarToken | undefined; let name: ScalarToken | undefined;
let uses: StringToken | undefined; let uses: StringToken | undefined;
let continueOnError: boolean | undefined; let continueOnError: boolean | ScalarToken | undefined;
let env: MappingToken | undefined; let env: MappingToken | undefined;
const ifCondition = new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined); const ifCondition = new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined);
for (const item of mapping) { for (const item of mapping) {
@@ -81,6 +81,8 @@ function convertStep(context: TemplateContext, idBuilder: IdBuilder, step: Templ
case "continue-on-error": case "continue-on-error":
if (!item.value.isExpression) { if (!item.value.isExpression) {
continueOnError = item.value.assertBoolean("steps item continue-on-error").value; continueOnError = item.value.assertBoolean("steps item continue-on-error").value;
} else {
continueOnError = item.value.assertScalar("steps item continue-on-error");
} }
} }
} }
workflow-parser/src/model/workflow-template.ts
+4 -4
View File
@@ -86,7 +86,7 @@ type BaseStep = {
id: string; id: string;
name?: ScalarToken; name?: ScalarToken;
if: BasicExpressionToken; if: BasicExpressionToken;
"continue-on-error"?: boolean; "continue-on-error"?: boolean | ScalarToken;
env?: MappingToken; env?: MappingToken;
}; };
@@ -154,12 +154,12 @@ export type PathFilterConfig = {
}; };
export type WorkflowDispatchConfig = { export type WorkflowDispatchConfig = {
inputs?: {[inputName: string]: InputConfig}; inputs?: { [inputName: string]: InputConfig };
}; };
export type WorkflowCallConfig = { export type WorkflowCallConfig = {
inputs?: {[inputName: string]: InputConfig & {default?: string | boolean | number | ScalarToken}}; inputs?: { [inputName: string]: InputConfig & { default?: string | boolean | number | ScalarToken } };
secrets?: {[secretName: string]: SecretConfig}; secrets?: { [secretName: string]: SecretConfig };
// TODO - these are supported in C# and Go but not in TS yet // TODO - these are supported in C# and Go but not in TS yet
// outputs: { [outputName: string]: OutputConfig } // outputs: { [outputName: string]: OutputConfig }
}; };