@farris/cli 1.0.15 → 1.0.16

package/ci/cli.js

@@ -161,23 +161,10 @@ 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缓冲区中添加变更
@@ -191,9 +178,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']);
         }
     }
 }
@@ -208,14 +195,14 @@ function tagMonoWorkspace(monoWorkspace, commitUrl) {
     // 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', 'Publish npm packages']);
+    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
-        console.log(`git push --tags -o ci.skip ${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 {
-        console.log(`git push --tags -o ci.skip`);
-        return childProcess.exec('git', ['push', '--tags', '-o', 'ci.skip']);
+        console.log(`git push --tags`);
+        return childProcess.exec('git', ['push', '--tags',]);
     }
 }
 

package/package.json

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