Skip to content

Commit 8e59470

Browse files
committed
Addressed issues with continue workflow and conflicts with scripts
1 parent b94f218 commit 8e59470

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

bin/tag-release-continue.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const callback = async options => {
2525
if (options.branch.includes("promote-release")) {
2626
flow = filterFlowBasedOnDevelopBranch(options, promoteContinue);
2727

28+
options.scripts = utils.getScripts("promote");
29+
options.command = "promote";
2830
if (options.scripts.postpromote) {
2931
flow.push(runPostScript);
3032
}
@@ -33,6 +35,8 @@ const callback = async options => {
3335

3436
flow = filterFlowBasedOnDevelopBranch(options, prContinue);
3537

38+
options.scripts = utils.getScripts("pr");
39+
options.command = "pr";
3640
if (options.scripts.postpr) {
3741
flow.push(runPostScript);
3842
}

src/helpers/setup.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,21 @@ const setup = async options => {
2121
options.workflow
2222
);
2323

24-
options.scripts = await utils.getScripts(options.command);
25-
if (options.scripts[`pre${options.command}`]) {
24+
options.scripts = utils.getScripts(options.command);
25+
if (
26+
options.command !== "continue" &&
27+
options.scripts[`pre${options.command}`]
28+
) {
2629
options.workflow.unshift(runPreScript);
2730
}
2831

2932
if (!options.callback) {
3033
/* istanbul ignore next */
3134
options.callback = () => console.log("Finished"); // eslint-disable-line no-console
32-
if (options.scripts[`post${options.command}`]) {
35+
if (
36+
options.command !== "continue" &&
37+
options.scripts[`post${options.command}`]
38+
) {
3339
options.workflow.push(runPostScript);
3440
}
3541
}

0 commit comments

Comments
 (0)