PR cleanup

Author: lokesh755

languageservice/src/context-providers/env.ts

@@ -1,14 +1,13 @@
 import {data, DescriptionDictionary} from "@actions/expressions";
 import {isScalar, isString} from "@actions/workflow-parser";
-import {isExecutableStep} from "@actions/workflow-parser/model/type-guards";
 import {MappingToken} from "@actions/workflow-parser/templates/tokens/mapping-token";
 import {WorkflowContext} from "../context/workflow-context.js";
 
 export function getEnvContext(workflowContext: WorkflowContext): DescriptionDictionary {
   const d = new DescriptionDictionary();
 
   //step env
-  if (workflowContext.step && isExecutableStep(workflowContext.step) && workflowContext.step.env) {
+  if (workflowContext.step && "env" in workflowContext.step && workflowContext.step.env) {
     envContext(workflowContext.step.env, d);
   }
 

languageservice/src/validate.test.ts

@@ -29,7 +29,9 @@ jobs:
         run: npm start
         background: true
       - wait: server
+        continue-on-error: true
       - wait-all:
+        continue-on-error: false
       - cancel: server`
       )
     );

workflow-parser/src/model/convert.test.ts

@@ -2,7 +2,6 @@
 import {nullTrace} from "../test-utils/null-trace.js";
 import {parseWorkflow} from "../workflows/workflow-parser.js";
 import {convertWorkflowTemplate, ErrorPolicy} from "./convert.js";
-import {isExecutableStep} from "./type-guards.js";
 
 function serializeTemplate(template: unknown): unknown {
   return JSON.parse(JSON.stringify(template));
@@ -494,13 +493,14 @@ jobs:
       const job = template.jobs[0];
       expect(job.type).toBe("job");
       if (job.type === "job") {
-        expect(isExecutableStep(job.steps[0])).toBe(true);
-        expect(isExecutableStep(job.steps[1])).toBe(true);
-        expect(isExecutableStep(job.steps[2])).toBe(true);
-        if (isExecutableStep(job.steps[0]) && isExecutableStep(job.steps[1]) && isExecutableStep(job.steps[2])) {
-          expect(job.steps[0].if?.expression).toBe("Success()");
-          expect(job.steps[1].if?.expression).toBe("FAILURE()");
-          expect(job.steps[2].if?.expression).toBe("Cancelled() || Always()");
+        const [firstStep, secondStep, thirdStep] = job.steps;
+        expect("if" in firstStep).toBe(true);
+        expect("if" in secondStep).toBe(true);
+        expect("if" in thirdStep).toBe(true);
+        if ("if" in firstStep && "if" in secondStep && "if" in thirdStep) {
+          expect(firstStep.if?.expression).toBe("Success()");
+          expect(secondStep.if?.expression).toBe("FAILURE()");
+          expect(thirdStep.if?.expression).toBe("Cancelled() || Always()");
         }
       }
     });
@@ -543,11 +543,12 @@ jobs:
       expect(job2.if?.expression).toBe("success()");
 
       if (job2.type === "job") {
-        expect(isExecutableStep(job2.steps[0])).toBe(true);
-        expect(isExecutableStep(job2.steps[1])).toBe(true);
-        if (isExecutableStep(job2.steps[0]) && isExecutableStep(job2.steps[1])) {
-          expect(job2.steps[0].if?.expression).toBe("success()");
-          expect(job2.steps[1].if?.expression).toBe("success()");
+        const [firstStep, secondStep] = job2.steps;
+        expect("if" in firstStep).toBe(true);
+        expect("if" in secondStep).toBe(true);
+        if ("if" in firstStep && "if" in secondStep) {
+          expect(firstStep.if?.expression).toBe("success()");
+          expect(secondStep.if?.expression).toBe("success()");
         }
       }
     });
@@ -582,13 +583,14 @@ jobs:
       const job = template.jobs[0];
       expect(job.type).toBe("job");
       if (job.type === "job") {
-        expect(isExecutableStep(job.steps[0])).toBe(true);
-        expect(isExecutableStep(job.steps[1])).toBe(true);
-        expect(isExecutableStep(job.steps[2])).toBe(true);
-        if (isExecutableStep(job.steps[0]) && isExecutableStep(job.steps[1]) && isExecutableStep(job.steps[2])) {
-          expect(job.steps[0].if?.expression).toBe("success().outputs.result");
-          expect(job.steps[1].if?.expression).toBe("failure().outputs.value");
-          expect(job.steps[2].if?.expression).toBe("always() && steps.test.outcome");
+        const [firstStep, secondStep, thirdStep] = job.steps;
+        expect("if" in firstStep).toBe(true);
+        expect("if" in secondStep).toBe(true);
+        expect("if" in thirdStep).toBe(true);
+        if ("if" in firstStep && "if" in secondStep && "if" in thirdStep) {
+          expect(firstStep.if?.expression).toBe("success().outputs.result");
+          expect(secondStep.if?.expression).toBe("failure().outputs.value");
+          expect(thirdStep.if?.expression).toBe("always() && steps.test.outcome");
         }
       }
     });

workflow-parser/src/model/converter/steps.ts

@@ -148,6 +148,7 @@ function convertStep(context: TemplateContext, idBuilder: IdBuilder, step: Templ
     return {
       id: id?.value || "",
       name: name || createSyntheticStepName("Wait"),
+      "continue-on-error": continueOnError,
       wait
     };
   }
@@ -156,6 +157,7 @@ function convertStep(context: TemplateContext, idBuilder: IdBuilder, step: Templ
     return {
       id: id?.value || "",
       name: name || createSyntheticStepName("Wait for all"),
+      "continue-on-error": continueOnError,
       "wait-all": waitAll
     };
   }

workflow-parser/src/model/type-guards.ts

@@ -8,10 +8,6 @@ export function isActionStep(step: Step): step is ActionStep {
   return (step as ActionStep).uses !== undefined;
 }
 
-export function isExecutableStep(step: Step): step is RunStep | ActionStep {
-  return isRunStep(step) || isActionStep(step);
-}
-
 export function isJob(job: WorkflowJob): job is Job {
   return job.type === "job";
 }

workflow-parser/src/model/workflow-template.ts

@@ -107,11 +107,15 @@ export type ActionStep = ExecutableStep & {
   background?: boolean;
 };
 
-export type WaitStep = BaseStep & {
+type ContinueOnErrorStep = BaseStep & {
+  "continue-on-error"?: boolean | ScalarToken;
+};
+
+export type WaitStep = ContinueOnErrorStep & {
   wait: StringToken[];
 };
 
-export type WaitAllStep = BaseStep & {
+export type WaitAllStep = ContinueOnErrorStep & {
   "wait-all": boolean;
 };
 

workflow-parser/src/workflow-v1.0.json

@@ -2189,6 +2189,7 @@
         "properties": {
           "name": "step-name",
           "id": "step-id",
+          "continue-on-error": "step-continue-on-error",
           "wait": {
             "type": "step-wait-target",
             "required": true
@@ -2201,6 +2202,7 @@
         "properties": {
           "name": "step-name",
           "id": "step-id",
+          "continue-on-error": "step-continue-on-error",
           "wait-all": {
             "type": "step-wait-all-value",
             "required": true

workflow-parser/testdata/reader/step-continue-on-error.yml

@@ -5,10 +5,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - run: exit 2
+      - id: build
+        run: exit 2
         continue-on-error: true
       - run: exit 1
         continue-on-error: false
+      - wait: build
+        continue-on-error: true
+      - wait-all:
+        continue-on-error: false
       - run: exit 1
 ---
 {
@@ -24,7 +29,7 @@ jobs:
       "runs-on": "ubuntu-latest",
       "steps": [
         {
-          "id": "__run",
+          "id": "build",
           "if": {
             "type": 3,
             "expr": "success()"
@@ -33,7 +38,7 @@ jobs:
           "run": "exit 2"
         },
         {
-          "id": "__run_2",
+          "id": "__run",
           "if": {
             "type": 3,
             "expr": "success()"
@@ -42,7 +47,21 @@ jobs:
           "run": "exit 1"
         },
         {
-          "id": "__run_3",
+          "id": "__wait",
+          "name": "Wait",
+          "continue-on-error": true,
+          "wait": [
+            "build"
+          ]
+        },
+        {
+          "id": "__wait-all",
+          "name": "Wait for all",
+          "continue-on-error": false,
+          "wait-all": true
+        },
+        {
+          "id": "__run_2",
           "if": {
             "type": 3,
             "expr": "success()"