@farris/cli 1.0.23 → 1.0.24

package/ci/cli.js

@@ -218,7 +218,7 @@ function updateProjectVersion(projectInfo, updateVersionType) {
         })
 }
 
-function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
+function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl) {
     let npmCommandArray = [];
     switch (updateVersionType) {
         case 'prerelease':
@@ -238,12 +238,20 @@ function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
     childProcess.execSync('npm', npmCommandArray);
     const packageJsonFilePath = `./package.json`;
     const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
+    monoWorkspace.version = packageConfig.version;
     // 向git缓冲区中添加变更
     childProcess.execSync('git', ['add', '.']);
     // // 提交变更记录
-    childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}`]);
+    childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}. [skip ci]`]);
     console.log(`Update MonoWorkspace version to v${packageConfig.version}`);
-    monoWorkspace.version = packageConfig.version;
+    const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+    console.log(`executing git push ${branch}`);
+    // 提交变更集
+    if (commitUrl) {
+        childProcess.execSync("git", ["push", commitUrl]);
+    } else {
+        childProcess.execSync('git', ['push']);
+    }
 }
 
 function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
@@ -258,7 +266,7 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     return `${versionMessage} ${suffix}`;
 }
 
-function commitVersionChanges(updatedVersions) {
+function commitVersionChanges(updatedVersions, commitUrl) {
     const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
 
     if (commitMessage) {
@@ -268,24 +276,21 @@ function commitVersionChanges(updatedVersions) {
         childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
 
         console.log(commitMessage);
-    }
-}
 
-function pushCommits(commitUrl) {
-    const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-    console.log(`executing git push ${branch}`);
-    // 提交变更集
-    if (commitUrl) {
-        return childProcess.exec("git", ["push", commitUrl]);
-    } else {
-        return childProcess.exec('git', ['push']);
+        const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+        console.log(`executing git push ${branch}`);
+        // 提交变更集
+        if (commitUrl) {
+            childProcess.execSync("git", ["push", commitUrl]);
+        } else {
+            childProcess.execSync('git', ['push']);
+        }
     }
 }
 
 function buildWorkspace(workspace) {
     console.log(`executing lerna run build --scope=${workspace.packageName}`)
     return childProcess.exec('lerna', ['run', 'build', `--scope=${workspace.packageName}`]);
-    // lerna run build --scope=@farris/ide-framework
 }
 
 function addTagToMonoWorkspace(monoWorkspace, commitUrl) {
@@ -395,8 +400,7 @@ function publish(commitUrl, updateVersionType) {
                 }, monoWorkspace);
                 const updatedVersions = monoWorkspace.updateResult;
                 commitVersionChanges(updatedVersions, commitUrl);
-                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType);
-                pushCommits(commitUrl);
+                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
                 return Promise.resolve(monoWorkspace);
             });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/cli",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {