@farris/cli 1.0.24 → 1.0.25

package/ci/cli.js

@@ -245,12 +245,13 @@ function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl)
     childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}. [skip ci]`]);
     console.log(`Update MonoWorkspace version to v${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]);
+        console.log(`executing git push ${branch} to ${commitUrl}`);
+        return childProcess.exec("git", ["push", commitUrl]);
     } else {
-        childProcess.execSync('git', ['push']);
+        console.log(`executing git push ${branch}`);
+        return childProcess.exec('git', ['push']);
     }
 }
 
@@ -267,7 +268,7 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
 }
 
 function commitVersionChanges(updatedVersions, commitUrl) {
-    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
+    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, ' [skip ci]');
 
     if (commitMessage) {
         // 向git缓冲区中添加变更
@@ -278,12 +279,14 @@ function commitVersionChanges(updatedVersions, commitUrl) {
         console.log(commitMessage);
 
         const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-        console.log(`executing git push ${branch}`);
+
         // 提交变更集
         if (commitUrl) {
-            childProcess.execSync("git", ["push", commitUrl]);
+            console.log(`executing git push ${branch} to ${commitUrl}`);
+            return childProcess.exec("git", ["push", commitUrl]);
         } else {
-            childProcess.execSync('git', ['push']);
+            console.log(`executing git push ${branch}`);
+            return childProcess.exec('git', ['push']);
         }
     }
 }
@@ -399,9 +402,13 @@ function publish(commitUrl, updateVersionType) {
                     return workspace;
                 }, monoWorkspace);
                 const updatedVersions = monoWorkspace.updateResult;
-                commitVersionChanges(updatedVersions, commitUrl);
-                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
-                return Promise.resolve(monoWorkspace);
+                return commitVersionChanges(updatedVersions, commitUrl)
+                    .then((result) => {
+                        return updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
+                    })
+                    .then((reulst) => {
+                        return Promise.resolve(monoWorkspace);
+                    });
             });
     });
     // 5. 编译所有Angular工作区

package/package.json

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