@farris/cli 1.0.13 → 1.0.17

package/ci/cli.js

@@ -81,10 +81,10 @@ cli
  */
 function getLastCommit() {
     if (hasTags()) {
-        log.silly("getLastTagInBranch");
+        console.log("getLastTagInBranch");
         return childProcess.execSync("git", ["describe", "--tags", "--abbrev=0"]);
     }
-    log.silly("getFirstCommit");
+    console.log("getFirstCommit");
     return childProcess.execSync("git", ["rev-list", "--max-parents=0", "HEAD"]);
 }
 
@@ -111,6 +111,7 @@ function hasTags() {
  */
 function checkProjectChanges(projectPath) {
     const lastCommit = getLastCommit();
+    console.log(`last commit ${lastCommit}`);
     return childProcess
         // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
         .exec("git", ["diff", "--name-only", lastCommit, projectPath])
@@ -161,29 +162,16 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
         return latestMessage = latestMessage + message;
     }, `${prefix} `)
     return `${versionMessage} ${suffix}`;
-    // const versionMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
-    //     if (Object.keys(updateVersion).length) {
-    //         const packageName = Object.keys(updateVersion)[0];
-    //         const version = updateVersion[packageName];
-    //         let message = `${packageName} to ${version}`;
-    //         if (index <= originalArray.length - 2) {
-    //             message = message + ', ';
-    //         }
-    //         latestMessage = latestMessage + message;
-    //     }
-    //     return latestMessage;
-    // }, `${prefix} `);
-    // return `${versionMessage} ${suffix}`;
 }
 
 function commitChanges(updatedVersions, commitUrl) {
-    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '.');
+    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
 
     if (commitMessage) {
         // 向git缓冲区中添加变更
         childProcess.execSync('git', ['add', '.']);
         // // 提交变更记录
-        childProcess.execSync('git', ['commit', '-m', `${commitMessage} [skip ci]`]);
+        childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
 
         console.log(commitMessage);
 
@@ -191,9 +179,9 @@ function commitChanges(updatedVersions, commitUrl) {
         console.log(`executing git push ${branch}`);
         // 提交变更集
         if (commitUrl) {
-            return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+            return childProcess.exec("git", ["push", commitUrl]);
         } else {
-            return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+            return childProcess.exec('git', ['push']);
         }
     }
 }
@@ -207,13 +195,15 @@ function buildWorkspace(workspace) {
 function tagMonoWorkspace(monoWorkspace, commitUrl) {
     // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
     const date = moment(new Date());
-    const tagVersion = `v${date.format('YYYMMDDHHmmss')}`;
-    childProcess.execSync('git', ['tag', tagVersion, '-m', "publish npm package"]);
+    const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
+    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
-        return childProcess.exec("git", ["push", '--tags', '-o', 'ci.skip', commitUrl]);
+        console.log(`git push --tags ${commitUrl}`);
+        return childProcess.exec("git", ["push", '--tags', commitUrl]);
     } else {
-        return childProcess.exec('git', ['push', '--tags', '-o', 'ci.skip']);
+        console.log(`git push --tags`);
+        return childProcess.exec('git', ['push', '--tags',]);
     }
 }
 
@@ -270,8 +260,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.13",
+  "version": "1.0.17",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {