@farris/cli 1.0.11 → 1.0.15

package/ci/cli.js

@@ -183,7 +183,7 @@ function commitChanges(updatedVersions, commitUrl) {
         // 向git缓冲区中添加变更
         childProcess.execSync('git', ['add', '.']);
         // // 提交变更记录
-        childProcess.execSync('git', ['commit', '-m', `${commitMessage} [skip ci]`]);
+        childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
 
         console.log(commitMessage);
 
@@ -205,15 +205,17 @@ function buildWorkspace(workspace) {
 }
 
 function tagMonoWorkspace(monoWorkspace, commitUrl) {
-    const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
+    // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
     const date = moment(new Date());
-    const tagVersion = `v${date.format('yyyyMMddhhmmss')}`;
-    childProcess.execSync('git', ['tag', tagVersion, '-m', tagMessage]);
+    const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
+    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages']);
     // 提交变更集
     if (commitUrl) {
-        return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+        console.log(`git push --tags -o ci.skip ${commitUrl}`);
+        return childProcess.exec("git", ["push", '--tags', '-o', 'ci.skip', commitUrl]);
     } else {
-        return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+        console.log(`git push --tags -o ci.skip`);
+        return childProcess.exec('git', ['push', '--tags', '-o', 'ci.skip']);
     }
 }
 
@@ -270,8 +272,8 @@ function publishAll(commitUrl) {
             return changedPromise;
         });
         return Promise.all(checkProjects)
-            .then(changedProjects => {
-                monoWorkspace.changedProjects = changedProjects;
+            .then((checkResults) => {
+                monoWorkspace.changedProjects = checkResults.filter((projectInfo) => projectInfo.hasChanged);
                 return Promise.resolve(monoWorkspace);
             });
     });

package/package.json

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