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

Use "job" instead of "job-id"

Browse Source
This commit is contained in:
Christopher Schleiden
2023-01-04 13:01:29 -08:00
committed by Jacob Wallraff
parent f8e41ccbd9
commit b739c98560
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions-languageservice/src/context/workflow-context.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export function getWorkflowContext(
// Iterate through the token path to find the job and step // Iterate through the token path to find the job and step
for (const token of tokenPath) { for (const token of tokenPath) {
switch (token.definition?.key) { switch (token.definition?.key) {
case "job-id": { case "job": {
const jobID = (token as StringToken).value; const jobID = (token as StringToken).value;
context.job = template.jobs.find(job => job.id.value === jobID); context.job = template.jobs.find(job => job.id.value === jobID);
break; break;
actions-languageservice/src/utils/find-token.test.ts
+14 -14
View File
@@ -145,7 +145,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping], ["job-factory", TokenType.Mapping],
["runs-on", TokenType.String, "runs-on"], ["runs-on", TokenType.String, "runs-on"],
["runs-on", TokenType.Sequence] ["runs-on", TokenType.Sequence]
@@ -180,7 +180,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping], ["job-factory", TokenType.Mapping],
["runs-on", TokenType.String, "runs-on"] ["runs-on", TokenType.String, "runs-on"]
], ],
@@ -201,7 +201,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping] ["job-factory", TokenType.Mapping]
], ],
parent: ["job-factory", TokenType.Mapping], parent: ["job-factory", TokenType.Mapping],
@@ -221,7 +221,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping] ["job-factory", TokenType.Mapping]
], ],
parent: ["job-factory", TokenType.Mapping], parent: ["job-factory", TokenType.Mapping],
@@ -241,7 +241,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping] ["job-factory", TokenType.Mapping]
], ],
parent: ["job-factory", TokenType.Mapping], parent: ["job-factory", TokenType.Mapping],
@@ -261,10 +261,10 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"] ["job", TokenType.String, "build"]
], ],
parent: ["jobs", TokenType.Mapping], parent: ["jobs", TokenType.Mapping],
key: ["job-id", TokenType.String, "build"], key: ["job", TokenType.String, "build"],
token: [null, TokenType.String, "continue-on-error:foo"] token: [null, TokenType.String, "continue-on-error:foo"]
}); });
}); });
@@ -280,7 +280,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping] ["job-factory", TokenType.Mapping]
], ],
parent: ["job-factory", TokenType.Mapping], parent: ["job-factory", TokenType.Mapping],
@@ -300,7 +300,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping] ["job-factory", TokenType.Mapping]
], ],
parent: ["job-factory", TokenType.Mapping], parent: ["job-factory", TokenType.Mapping],
@@ -320,10 +320,10 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"] ["job", TokenType.String, "build"]
], ],
parent: ["jobs", TokenType.Mapping], parent: ["jobs", TokenType.Mapping],
key: ["job-id", TokenType.String, "build"], key: ["job", TokenType.String, "build"],
token: [null, TokenType.String, "runs-"] token: [null, TokenType.String, "runs-"]
}); });
}); });
@@ -340,10 +340,10 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"] ["job", TokenType.String, "build"]
], ],
parent: ["jobs", TokenType.Mapping], parent: ["jobs", TokenType.Mapping],
key: ["job-id", TokenType.String, "build"], key: ["job", TokenType.String, "build"],
token: [null, TokenType.String, "runs-"] token: [null, TokenType.String, "runs-"]
}); });
}); });
@@ -360,7 +360,7 @@ jobs:
["workflow-root-strict", TokenType.Mapping], ["workflow-root-strict", TokenType.Mapping],
["jobs", TokenType.String, "jobs"], ["jobs", TokenType.String, "jobs"],
["jobs", TokenType.Mapping], ["jobs", TokenType.Mapping],
["job-id", TokenType.String, "build"], ["job", TokenType.String, "build"],
["job-factory", TokenType.Mapping], ["job-factory", TokenType.Mapping],
["runs-on", TokenType.String, "runs-on"] ["runs-on", TokenType.String, "runs-on"]
], ],