@actions/workflow-parser 0.3.20 → 0.3.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/model/converter/cron.d.ts +5 -0
- package/dist/model/converter/cron.d.ts.map +1 -1
- package/dist/model/converter/cron.js +65 -5
- package/dist/model/converter/cron.js.map +1 -1
- package/dist/model/converter/events.js +1 -1
- package/dist/model/converter/events.js.map +1 -1
- package/dist/model/converter/if-condition.d.ts +32 -0
- package/dist/model/converter/if-condition.d.ts.map +1 -0
- package/dist/model/converter/if-condition.js +122 -0
- package/dist/model/converter/if-condition.js.map +1 -0
- package/dist/model/converter/job.d.ts.map +1 -1
- package/dist/model/converter/job.js +7 -3
- package/dist/model/converter/job.js.map +1 -1
- package/dist/model/converter/steps.d.ts.map +1 -1
- package/dist/model/converter/steps.js +7 -3
- package/dist/model/converter/steps.js.map +1 -1
- package/dist/templates/template-reader.d.ts.map +1 -1
- package/dist/templates/template-reader.js +1 -9
- package/dist/templates/template-reader.js.map +1 -1
- package/dist/workflow-v1.0.json +3 -9
- package/package.json +3 -3
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Checks if a cron expression specifies an interval shorter than 5 minutes.
|
|
3
|
+
* GitHub Actions schedules run at most every 5 minutes, so intervals < 5 min won't work as expected.
|
|
4
|
+
*/
|
|
5
|
+
export declare function hasCronIntervalLessThan5Minutes(cron: string): boolean;
|
|
1
6
|
export declare function isValidCron(cron: string): boolean;
|
|
2
7
|
export declare function getCronDescription(cronspec: string): string | undefined;
|
|
3
8
|
//# sourceMappingURL=cron.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.d.ts","sourceRoot":"","sources":["../../../src/model/converter/cron.ts"],"names":[],"mappings":"AAUA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBjD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"cron.d.ts","sourceRoot":"","sources":["../../../src/model/converter/cron.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAUrE;AA0DD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBjD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqBvE"}
|
|
@@ -1,5 +1,69 @@
|
|
|
1
1
|
import cronstrue from "cronstrue";
|
|
2
2
|
import { MONTH_RANGE, HOUR_RANGE, MINUTE_RANGE, DOM_RANGE, DOW_RANGE } from "./cron-constants";
|
|
3
|
+
/**
|
|
4
|
+
* Checks if a cron expression specifies an interval shorter than 5 minutes.
|
|
5
|
+
* GitHub Actions schedules run at most every 5 minutes, so intervals < 5 min won't work as expected.
|
|
6
|
+
*/
|
|
7
|
+
export function hasCronIntervalLessThan5Minutes(cron) {
|
|
8
|
+
if (!isValidCron(cron)) {
|
|
9
|
+
return false;
|
|
10
|
+
}
|
|
11
|
+
const parts = cron.split(/ +/);
|
|
12
|
+
const minutePart = parts[0];
|
|
13
|
+
// Parse the minute field to determine the effective interval
|
|
14
|
+
return getMinuteInterval(minutePart) < 5;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Gets the minimum interval in minutes between cron executions based on the minute field.
|
|
18
|
+
* Returns 60 if there's only one execution per hour, otherwise returns the minimum gap.
|
|
19
|
+
*/
|
|
20
|
+
function getMinuteInterval(minutePart) {
|
|
21
|
+
// Handle step expressions like */1, */3, 0-59/2
|
|
22
|
+
if (minutePart.includes("/")) {
|
|
23
|
+
const [, step] = minutePart.split("/");
|
|
24
|
+
const stepNum = parseInt(step, 10);
|
|
25
|
+
if (!isNaN(stepNum) && stepNum > 0) {
|
|
26
|
+
return stepNum;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
// Handle comma-separated values like 0,2,4 or 0,1,5,10
|
|
30
|
+
if (minutePart.includes(",")) {
|
|
31
|
+
const values = minutePart
|
|
32
|
+
.split(",")
|
|
33
|
+
.map(v => parseInt(v, 10))
|
|
34
|
+
.filter(n => !isNaN(n))
|
|
35
|
+
.sort((a, b) => a - b);
|
|
36
|
+
if (values.length >= 2) {
|
|
37
|
+
let minGap = 60;
|
|
38
|
+
for (let i = 1; i < values.length; i++) {
|
|
39
|
+
const gap = values[i] - values[i - 1];
|
|
40
|
+
if (gap < minGap) {
|
|
41
|
+
minGap = gap;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
// Check wrap-around gap from last minute to first minute of next hour
|
|
45
|
+
const wrapGap = values[0] + 60 - values[values.length - 1];
|
|
46
|
+
if (wrapGap < minGap) {
|
|
47
|
+
minGap = wrapGap;
|
|
48
|
+
}
|
|
49
|
+
return minGap;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
// Handle range expressions like 0-4 (runs every minute from 0-4)
|
|
53
|
+
if (minutePart.includes("-") && !minutePart.includes("/")) {
|
|
54
|
+
const [start, end] = minutePart.split("-").map(v => parseInt(v, 10));
|
|
55
|
+
if (!isNaN(start) && !isNaN(end) && end > start) {
|
|
56
|
+
// A range without step means every minute in that range
|
|
57
|
+
return 1;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
// * means every minute
|
|
61
|
+
if (minutePart === "*") {
|
|
62
|
+
return 1;
|
|
63
|
+
}
|
|
64
|
+
// Single value or unrecognized pattern - assume hourly (60 min interval)
|
|
65
|
+
return 60;
|
|
66
|
+
}
|
|
3
67
|
export function isValidCron(cron) {
|
|
4
68
|
// https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
|
|
5
69
|
const parts = cron.split(/ +/);
|
|
@@ -32,11 +96,7 @@ export function getCronDescription(cronspec) {
|
|
|
32
96
|
return;
|
|
33
97
|
}
|
|
34
98
|
// Make first character lowercase
|
|
35
|
-
|
|
36
|
-
result +=
|
|
37
|
-
"\n\nActions schedules run at most every 5 minutes." +
|
|
38
|
-
" [Learn more](https://docs.github.com/actions/using-workflows/workflow-syntax-for-github-actions#onschedule)";
|
|
39
|
-
return result;
|
|
99
|
+
return "Runs " + desc.charAt(0).toLowerCase() + desc.slice(1);
|
|
40
100
|
}
|
|
41
101
|
function validateCronPart(value, range, allowSeparators = true) {
|
|
42
102
|
if (range.names && range.names[value.toLowerCase()] !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../../src/model/converter/cron.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAQ7F,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,4FAA4F;IAE5F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACrB,OAAO,KAAK,CAAC;KACd;IACD,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;IAEjD,OAAO,CACL,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC;QACvC,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC;QACnC,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC;QAChC,gBAAgB,CAAC,MAAM,EAAE,WAAW,CAAC;QACrC,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CACjC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB;IACjD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI;QACF,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE;YAClC,uBAAuB,EAAE,IAAI;YAC7B,mBAAmB,EAAE,KAAK;YAC1B,mBAAmB,EAAE,IAAI;YACzB,qFAAqF;YACrF,qEAAqE;YACrE,0BAA0B,EAAE,IAAI;SACjC,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO;KACR;IAED,iCAAiC;IACjC,
|
|
1
|
+
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../../src/model/converter/cron.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,7 +113,7 @@ function convertSchedule(context, token) {
|
|
|
113
113
|
const cron = schedule.value.assertString(`schedule cron`);
|
|
114
114
|
// Validate the cron string
|
|
115
115
|
if (!isValidCron(cron.value)) {
|
|
116
|
-
context.error(cron, "Invalid cron
|
|
116
|
+
context.error(cron, "Invalid cron expression. Expected format: '* * * * *' (minute hour day month weekday)");
|
|
117
117
|
}
|
|
118
118
|
result.push({ cron: cron.value });
|
|
119
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/model/converter/events.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/model/converter/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { DefinitionInfo } from "../../templates/schema/definition-info";
|
|
2
|
+
import { TemplateContext } from "../../templates/template-context";
|
|
3
|
+
import { BasicExpressionToken, TemplateToken } from "../../templates/tokens";
|
|
4
|
+
/**
|
|
5
|
+
* Ensures a condition expression contains a status function call.
|
|
6
|
+
* If the condition doesn't contain success(), failure(), cancelled(), or always(),
|
|
7
|
+
* wraps it in `success() && (condition)`.
|
|
8
|
+
*
|
|
9
|
+
* Parses the expression to accurately detect status functions, avoiding false positives
|
|
10
|
+
* from string literals or property access. If parsing fails (e.g., partially typed expression),
|
|
11
|
+
* returns the original condition unchanged to allow validation to report the actual error.
|
|
12
|
+
*
|
|
13
|
+
* @param condition The condition expression to check
|
|
14
|
+
* @param definitionInfo Schema definition containing allowed contexts for parsing
|
|
15
|
+
* @returns The condition with status function guaranteed, or original on parse error
|
|
16
|
+
*/
|
|
17
|
+
export declare function ensureStatusFunction(condition: string, definitionInfo: DefinitionInfo | undefined): string;
|
|
18
|
+
/**
|
|
19
|
+
* Converts an if condition token to a BasicExpressionToken.
|
|
20
|
+
* Treats the value as a string and parses it as an expression.
|
|
21
|
+
* Wraps the condition in success() && (...) if it doesn't already contain a status function.
|
|
22
|
+
* This allows both 'if: success()' and 'if: ${{ success() }}' to work correctly.
|
|
23
|
+
*
|
|
24
|
+
* Reads the allowed context directly from the schema definition attached to the token,
|
|
25
|
+
* ensuring consistency with the schema.
|
|
26
|
+
*
|
|
27
|
+
* @param context The template context for error reporting
|
|
28
|
+
* @param token The token containing the if condition
|
|
29
|
+
* @returns A BasicExpressionToken with the processed condition, or undefined on error
|
|
30
|
+
*/
|
|
31
|
+
export declare function convertToIfCondition(context: TemplateContext, token: TemplateToken): BasicExpressionToken | undefined;
|
|
32
|
+
//# sourceMappingURL=if-condition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"if-condition.d.ts","sourceRoot":"","sources":["../../../src/model/converter/if-condition.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAC,oBAAoB,EAAmB,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAE5F;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,SAAS,GAAG,MAAM,CAsB1G;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,GAAG,oBAAoB,GAAG,SAAS,CAuCrH"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { Lexer, Parser } from "@actions/expressions";
|
|
2
|
+
import { Binary, FunctionCall, Grouping, IndexAccess, Logical, Unary } from "@actions/expressions/ast";
|
|
3
|
+
import { splitAllowedContext } from "../../templates/allowed-context";
|
|
4
|
+
import { BasicExpressionToken, ExpressionToken } from "../../templates/tokens";
|
|
5
|
+
/**
|
|
6
|
+
* Ensures a condition expression contains a status function call.
|
|
7
|
+
* If the condition doesn't contain success(), failure(), cancelled(), or always(),
|
|
8
|
+
* wraps it in `success() && (condition)`.
|
|
9
|
+
*
|
|
10
|
+
* Parses the expression to accurately detect status functions, avoiding false positives
|
|
11
|
+
* from string literals or property access. If parsing fails (e.g., partially typed expression),
|
|
12
|
+
* returns the original condition unchanged to allow validation to report the actual error.
|
|
13
|
+
*
|
|
14
|
+
* @param condition The condition expression to check
|
|
15
|
+
* @param definitionInfo Schema definition containing allowed contexts for parsing
|
|
16
|
+
* @returns The condition with status function guaranteed, or original on parse error
|
|
17
|
+
*/
|
|
18
|
+
export function ensureStatusFunction(condition, definitionInfo) {
|
|
19
|
+
const allowedContext = definitionInfo?.allowedContext || [];
|
|
20
|
+
try {
|
|
21
|
+
const { namedContexts, functions } = splitAllowedContext(allowedContext);
|
|
22
|
+
const lexer = new Lexer(condition);
|
|
23
|
+
const result = lexer.lex();
|
|
24
|
+
const parser = new Parser(result.tokens, namedContexts, functions);
|
|
25
|
+
const tree = parser.parse();
|
|
26
|
+
// Check if tree contains status function
|
|
27
|
+
if (walkTreeToFindStatusFunctionCalls(tree)) {
|
|
28
|
+
return condition; // Already has status function
|
|
29
|
+
}
|
|
30
|
+
// Wrap it
|
|
31
|
+
return `success() && (${condition})`;
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
// Parse error - return original and let validation report the actual error
|
|
35
|
+
// This is important for hover/autocomplete on partially-typed expressions
|
|
36
|
+
return condition;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Converts an if condition token to a BasicExpressionToken.
|
|
41
|
+
* Treats the value as a string and parses it as an expression.
|
|
42
|
+
* Wraps the condition in success() && (...) if it doesn't already contain a status function.
|
|
43
|
+
* This allows both 'if: success()' and 'if: ${{ success() }}' to work correctly.
|
|
44
|
+
*
|
|
45
|
+
* Reads the allowed context directly from the schema definition attached to the token,
|
|
46
|
+
* ensuring consistency with the schema.
|
|
47
|
+
*
|
|
48
|
+
* @param context The template context for error reporting
|
|
49
|
+
* @param token The token containing the if condition
|
|
50
|
+
* @returns A BasicExpressionToken with the processed condition, or undefined on error
|
|
51
|
+
*/
|
|
52
|
+
export function convertToIfCondition(context, token) {
|
|
53
|
+
const scalar = token.assertScalar("if condition");
|
|
54
|
+
// Get allowed context from the schema definition attached to the token
|
|
55
|
+
const allowedContext = token.definitionInfo?.allowedContext || [];
|
|
56
|
+
// If it's already an expression, use its value
|
|
57
|
+
let condition;
|
|
58
|
+
let source;
|
|
59
|
+
if (scalar instanceof BasicExpressionToken) {
|
|
60
|
+
condition = scalar.expression;
|
|
61
|
+
source = scalar.source;
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
// Otherwise, treat it as a string
|
|
65
|
+
const stringToken = scalar.assertString("if condition");
|
|
66
|
+
condition = stringToken.value.trim();
|
|
67
|
+
source = stringToken.source;
|
|
68
|
+
}
|
|
69
|
+
let finalCondition;
|
|
70
|
+
if (!condition) {
|
|
71
|
+
// Empty condition defaults to success()
|
|
72
|
+
finalCondition = "success()";
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
// Ensure the condition has a status function, wrapping if needed
|
|
76
|
+
finalCondition = ensureStatusFunction(condition, token.definitionInfo);
|
|
77
|
+
}
|
|
78
|
+
// Validate the expression before creating the token
|
|
79
|
+
try {
|
|
80
|
+
ExpressionToken.validateExpression(finalCondition, allowedContext);
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
context.error(token, err);
|
|
84
|
+
return undefined;
|
|
85
|
+
}
|
|
86
|
+
// Create a BasicExpressionToken with the final condition
|
|
87
|
+
return new BasicExpressionToken(token.file, token.range, finalCondition, token.definitionInfo, undefined, source);
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Walks an expression AST to find status function calls (success, failure, cancelled, always).
|
|
91
|
+
* Recursively checks all nodes including function arguments and logical/binary operations.
|
|
92
|
+
*/
|
|
93
|
+
function walkTreeToFindStatusFunctionCalls(tree) {
|
|
94
|
+
if (!tree) {
|
|
95
|
+
return false;
|
|
96
|
+
}
|
|
97
|
+
if (tree instanceof FunctionCall) {
|
|
98
|
+
const funcName = tree.functionName.lexeme.toLowerCase();
|
|
99
|
+
if (funcName === "success" || funcName === "failure" || funcName === "cancelled" || funcName === "always") {
|
|
100
|
+
return true;
|
|
101
|
+
}
|
|
102
|
+
// Check arguments recursively
|
|
103
|
+
return tree.args.some(arg => walkTreeToFindStatusFunctionCalls(arg));
|
|
104
|
+
}
|
|
105
|
+
if (tree instanceof Binary) {
|
|
106
|
+
return walkTreeToFindStatusFunctionCalls(tree.left) || walkTreeToFindStatusFunctionCalls(tree.right);
|
|
107
|
+
}
|
|
108
|
+
if (tree instanceof Unary) {
|
|
109
|
+
return walkTreeToFindStatusFunctionCalls(tree.expr);
|
|
110
|
+
}
|
|
111
|
+
if (tree instanceof Logical) {
|
|
112
|
+
return tree.args.some(arg => walkTreeToFindStatusFunctionCalls(arg));
|
|
113
|
+
}
|
|
114
|
+
if (tree instanceof Grouping) {
|
|
115
|
+
return walkTreeToFindStatusFunctionCalls(tree.group);
|
|
116
|
+
}
|
|
117
|
+
if (tree instanceof IndexAccess) {
|
|
118
|
+
return walkTreeToFindStatusFunctionCalls(tree.expr) || walkTreeToFindStatusFunctionCalls(tree.index);
|
|
119
|
+
}
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=if-condition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"if-condition.js","sourceRoot":"","sources":["../../../src/model/converter/if-condition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../src/model/converter/job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAuB,YAAY,EAAe,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnH,OAAO,EAAO,WAAW,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../src/model/converter/job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAuB,YAAY,EAAe,WAAW,EAAgB,MAAM,wBAAwB,CAAC;AAEnH,OAAO,EAAO,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAUvD,wBAAgB,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,WAAW,CA+J1G"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BasicExpressionToken } from "../../templates/tokens";
|
|
2
2
|
import { isSequence, isString } from "../../templates/tokens/type-guards";
|
|
3
|
+
import { convertToIfCondition } from "./if-condition";
|
|
3
4
|
import { convertConcurrency } from "./concurrency";
|
|
4
5
|
import { convertToJobContainer, convertToJobServices } from "./container";
|
|
5
6
|
import { handleTemplateTokenErrors } from "./handle-errors";
|
|
@@ -12,7 +13,7 @@ export function convertJob(context, jobKey, token) {
|
|
|
12
13
|
if (error) {
|
|
13
14
|
context.error(jobKey, error);
|
|
14
15
|
}
|
|
15
|
-
let concurrency, container, env, environment, name, outputs, runsOn, services, strategy, snapshot;
|
|
16
|
+
let concurrency, container, env, environment, ifCondition, name, outputs, runsOn, services, strategy, snapshot;
|
|
16
17
|
let needs = undefined;
|
|
17
18
|
let steps = [];
|
|
18
19
|
let workflowJobRef;
|
|
@@ -39,6 +40,9 @@ export function convertJob(context, jobKey, token) {
|
|
|
39
40
|
handleTemplateTokenErrors(item.value, context, undefined, () => convertToActionsEnvironmentRef(context, item.value));
|
|
40
41
|
environment = item.value;
|
|
41
42
|
break;
|
|
43
|
+
case "if":
|
|
44
|
+
ifCondition = convertToIfCondition(context, item.value);
|
|
45
|
+
break;
|
|
42
46
|
case "name":
|
|
43
47
|
name = item.value.assertScalar("job name");
|
|
44
48
|
break;
|
|
@@ -104,7 +108,7 @@ export function convertJob(context, jobKey, token) {
|
|
|
104
108
|
id: jobKey,
|
|
105
109
|
name: jobName(name, jobKey),
|
|
106
110
|
needs: needs || [],
|
|
107
|
-
if: new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined),
|
|
111
|
+
if: ifCondition || new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined),
|
|
108
112
|
ref: workflowJobRef,
|
|
109
113
|
"input-definitions": undefined,
|
|
110
114
|
"input-values": workflowJobInputs,
|
|
@@ -122,7 +126,7 @@ export function convertJob(context, jobKey, token) {
|
|
|
122
126
|
id: jobKey,
|
|
123
127
|
name: jobName(name, jobKey),
|
|
124
128
|
needs,
|
|
125
|
-
if: new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined),
|
|
129
|
+
if: ifCondition || new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined),
|
|
126
130
|
env,
|
|
127
131
|
concurrency,
|
|
128
132
|
environment,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../src/model/converter/job.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../src/model/converter/job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"steps.d.ts","sourceRoot":"","sources":["../../../src/model/converter/steps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAA+D,aAAa,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"steps.d.ts","sourceRoot":"","sources":["../../../src/model/converter/steps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAA+D,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAInH,OAAO,EAAa,IAAI,EAAC,MAAM,sBAAsB,CAAC;AAItD,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI,EAAE,CAmCnF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BasicExpressionToken } from "../../templates/tokens";
|
|
2
2
|
import { isSequence } from "../../templates/tokens/type-guards";
|
|
3
3
|
import { isActionStep } from "../type-guards";
|
|
4
|
+
import { convertToIfCondition } from "./if-condition";
|
|
4
5
|
import { handleTemplateTokenErrors } from "./handle-errors";
|
|
5
6
|
import { IdBuilder } from "./id-builder";
|
|
6
7
|
export function convertSteps(context, steps) {
|
|
@@ -40,7 +41,7 @@ function convertStep(context, idBuilder, step) {
|
|
|
40
41
|
let uses;
|
|
41
42
|
let continueOnError;
|
|
42
43
|
let env;
|
|
43
|
-
|
|
44
|
+
let ifCondition;
|
|
44
45
|
for (const item of mapping) {
|
|
45
46
|
const key = item.key.assertString("steps item key");
|
|
46
47
|
switch (key.value) {
|
|
@@ -65,6 +66,9 @@ function convertStep(context, idBuilder, step) {
|
|
|
65
66
|
case "env":
|
|
66
67
|
env = item.value.assertMapping("step env");
|
|
67
68
|
break;
|
|
69
|
+
case "if":
|
|
70
|
+
ifCondition = convertToIfCondition(context, item.value);
|
|
71
|
+
break;
|
|
68
72
|
case "continue-on-error":
|
|
69
73
|
if (!item.value.isExpression) {
|
|
70
74
|
continueOnError = item.value.assertBoolean("steps item continue-on-error").value;
|
|
@@ -78,7 +82,7 @@ function convertStep(context, idBuilder, step) {
|
|
|
78
82
|
return {
|
|
79
83
|
id: id?.value || "",
|
|
80
84
|
name,
|
|
81
|
-
if: ifCondition,
|
|
85
|
+
if: ifCondition || new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined),
|
|
82
86
|
"continue-on-error": continueOnError,
|
|
83
87
|
env,
|
|
84
88
|
run
|
|
@@ -88,7 +92,7 @@ function convertStep(context, idBuilder, step) {
|
|
|
88
92
|
return {
|
|
89
93
|
id: id?.value || "",
|
|
90
94
|
name,
|
|
91
|
-
if: ifCondition,
|
|
95
|
+
if: ifCondition || new BasicExpressionToken(undefined, undefined, "success()", undefined, undefined, undefined),
|
|
92
96
|
"continue-on-error": continueOnError,
|
|
93
97
|
env,
|
|
94
98
|
uses
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../src/model/converter/steps.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAwD,MAAM,wBAAwB,CAAC;AACnH,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../src/model/converter/steps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-reader.d.ts","sourceRoot":"","sources":["../../src/templates/template-reader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"template-reader.d.ts","sourceRoot":"","sources":["../../src/templates/template-reader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAQ7C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAQL,aAAa,EACd,MAAM,UAAU,CAAC;AAOlB,wBAAgB,YAAY,CAC1B,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,aAAa,GAAG,SAAS,CAa3B;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
3
3
|
import { DefinitionInfo } from "./schema/definition-info";
|
|
4
4
|
import { DefinitionType } from "./schema/definition-type";
|
|
5
|
-
import { StringDefinition } from "./schema/string-definition";
|
|
6
5
|
import { ANY, CLOSE_EXPRESSION, INSERT_DIRECTIVE, OPEN_EXPRESSION } from "./template-constants";
|
|
7
6
|
import { BasicExpressionToken, ExpressionToken, InsertExpressionToken, StringToken } from "./tokens";
|
|
8
7
|
import { isString } from "./tokens/type-guards";
|
|
@@ -329,14 +328,7 @@ class TemplateReader {
|
|
|
329
328
|
const raw = token.source || token.value;
|
|
330
329
|
let startExpression = raw.indexOf(OPEN_EXPRESSION);
|
|
331
330
|
if (startExpression < 0) {
|
|
332
|
-
// Doesn't contain "
|
|
333
|
-
// Check if value should still be evaluated as an expression
|
|
334
|
-
if (definitionInfo.definition instanceof StringDefinition && definitionInfo.definition.isExpression) {
|
|
335
|
-
const expression = this.parseIntoExpressionToken(token.range, raw, allowedContext, token, definitionInfo);
|
|
336
|
-
if (expression) {
|
|
337
|
-
return expression;
|
|
338
|
-
}
|
|
339
|
-
}
|
|
331
|
+
// Doesn't contain "{{"
|
|
340
332
|
return token;
|
|
341
333
|
}
|
|
342
334
|
// Break the value into segments of LiteralToken and ExpressionToken
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-reader.js","sourceRoot":"","sources":["../../src/templates/template-reader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"template-reader.js","sourceRoot":"","sources":["../../src/templates/template-reader.ts"],"names":[],"mappings":"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"}
|
package/dist/workflow-v1.0.json
CHANGED
|
@@ -1842,9 +1842,7 @@
|
|
|
1842
1842
|
"cancelled(0,0)",
|
|
1843
1843
|
"success(0,MAX)"
|
|
1844
1844
|
],
|
|
1845
|
-
"string": {
|
|
1846
|
-
"is-expression": true
|
|
1847
|
-
}
|
|
1845
|
+
"string": {}
|
|
1848
1846
|
},
|
|
1849
1847
|
"job-if-result": {
|
|
1850
1848
|
"context": [
|
|
@@ -1949,9 +1947,7 @@
|
|
|
1949
1947
|
"matrix"
|
|
1950
1948
|
],
|
|
1951
1949
|
"description": "Use the if conditional to prevent a snapshot from being taken unless a condition is met. Any supported context and expression can be used to create a conditional. Expressions in an `if` conditional do not require the bracketed expression syntax. When you use expressions in an `if` conditional, you may omit the expression syntax because GitHub automatically evaluates the `if` conditional as an expression.",
|
|
1952
|
-
"string": {
|
|
1953
|
-
"is-expression": true
|
|
1954
|
-
}
|
|
1950
|
+
"string": {}
|
|
1955
1951
|
},
|
|
1956
1952
|
"runs-on": {
|
|
1957
1953
|
"description": "Use `runs-on` to define the type of machine to run the job on.\n* The destination machine can be either a GitHub-hosted runner, larger runner, or a self-hosted runner.\n* You can target runners based on the labels assigned to them, or their group membership, or a combination of these.\n* You can provide `runs-on` as a single string or as an array of strings.\n* If you specify an array of strings, your workflow will execute on any runner that matches all of the specified `runs-on` values.\n* If you would like to run your workflow on multiple machines, use `jobs.<job_id>.strategy`.",
|
|
@@ -2216,9 +2212,7 @@
|
|
|
2216
2212
|
"hashFiles(1,255)"
|
|
2217
2213
|
],
|
|
2218
2214
|
"description": "Use the `if` conditional to prevent a step from running unless a condition is met. Any supported context and expression can be used to create a conditional. Expressions in an `if` conditional do not require the bracketed expression syntax. When you use expressions in an `if` conditional, you may omit the expression syntax because GitHub automatically evaluates the `if` conditional as an expression.",
|
|
2219
|
-
"string": {
|
|
2220
|
-
"is-expression": true
|
|
2221
|
-
}
|
|
2215
|
+
"string": {}
|
|
2222
2216
|
},
|
|
2223
2217
|
"step-if-result": {
|
|
2224
2218
|
"context": [
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@actions/workflow-parser",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.21",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"source": "./src/index.ts",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"watch": "tsc --build tsconfig.build.json --watch"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@actions/expressions": "^0.3.
|
|
48
|
+
"@actions/expressions": "^0.3.21",
|
|
49
49
|
"cronstrue": "^2.21.0",
|
|
50
50
|
"yaml": "^2.0.0-8"
|
|
51
51
|
},
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"ts-jest": "^29.0.3",
|
|
69
69
|
"typescript": "^4.8.4"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "dfb411f71ec51c5a6ff9c7278efb65ba572a1f7a"
|
|
72
72
|
}
|