From ecbe095be20ca49332dbd23d26bd78a4d821eb98 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Tue, 31 Dec 2019 22:57:12 +0100 Subject: [PATCH 1/2] fix(trigger): fix a bug it threw an exception at `finished` step --- packages/shipjs/src/step/{ => prepare}/finished.js | 4 ++-- packages/shipjs/src/step/release/finished.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) rename packages/shipjs/src/step/{ => prepare}/finished.js (89%) create mode 100644 packages/shipjs/src/step/release/finished.js diff --git a/packages/shipjs/src/step/finished.js b/packages/shipjs/src/step/prepare/finished.js similarity index 89% rename from packages/shipjs/src/step/finished.js rename to packages/shipjs/src/step/prepare/finished.js index c012a946..0cb93ab0 100644 --- a/packages/shipjs/src/step/finished.js +++ b/packages/shipjs/src/step/prepare/finished.js @@ -1,6 +1,6 @@ import chalk from 'chalk'; -import runStep from './runStep'; -import { print } from '../util'; +import runStep from '../runStep'; +import { print } from '../../util'; export default ({ baseBranch, stagingBranch, pullRequestUrl, dryRun }) => runStep({ title: 'All Finished.' }, () => { diff --git a/packages/shipjs/src/step/release/finished.js b/packages/shipjs/src/step/release/finished.js new file mode 100644 index 00000000..f0672d4a --- /dev/null +++ b/packages/shipjs/src/step/release/finished.js @@ -0,0 +1,3 @@ +import runStep from '../runStep'; + +export default () => runStep({ title: 'All Finished.' }, () => {}); From 37bc7433847c806aaf2d2f4f009f3377a9186f38 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Tue, 31 Dec 2019 23:00:46 +0100 Subject: [PATCH 2/2] fix: wrong import paths --- packages/shipjs/src/flow/prepare.js | 2 +- packages/shipjs/src/flow/release.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shipjs/src/flow/prepare.js b/packages/shipjs/src/flow/prepare.js index d92fc6a7..85317bd2 100644 --- a/packages/shipjs/src/flow/prepare.js +++ b/packages/shipjs/src/flow/prepare.js @@ -21,7 +21,7 @@ import createPullRequest from '../step/prepare/createPullRequest'; import notifyPrepared from '../step/prepare/notifyPrepared'; import pushToStagingBranch from '../step/prepare/pushToStagingBranch'; import checkGitHubToken from '../step/checkGitHubToken'; -import finished from '../step/finished'; +import finished from '../step/prepare/finished'; import { print } from '../util'; import { warning } from '../color'; diff --git a/packages/shipjs/src/flow/release.js b/packages/shipjs/src/flow/release.js index 80446d3d..b35008d7 100644 --- a/packages/shipjs/src/flow/release.js +++ b/packages/shipjs/src/flow/release.js @@ -15,7 +15,7 @@ import gitPush from '../step/release/gitPush'; import createGitHubRelease from '../step/release/createGitHubRelease'; import notifyReleaseSuccess from '../step/release/notifyReleaseSuccess'; import checkGitHubToken from '../step/checkGitHubToken'; -import finished from '../step/finished'; +import finished from '../step/release/finished'; import { detectYarn } from '../util'; async function release({ help = false, dir = '.', dryRun = false }) {