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

Merge pull request #19 from actions/felipesu19-on-error-tokens

Browse Source 
Fixes errors around "on-error" token parsing
This commit is contained in:
Felipe Suero
2023-04-12 11:45:38 -04:00
committed by GitHub
parent 5aed7594cf 6e8cbc3e8c
commit e37d7620d6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
workflow-parser/src/model/converter/steps.ts
+6 -2
View File
@@ -50,7 +50,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) {
@@ -78,7 +78,11 @@ function convertStep(context: TemplateContext, idBuilder: IdBuilder, step: Templ
env = item.value.assertMapping("step env"); env = item.value.assertMapping("step env");
break; break;
case "continue-on-error": case "continue-on-error":
continueOnError = item.value.assertBoolean("steps item continue-on-error").value; if (!item.value.isExpression) {
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
+1 -1
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;
}; };