sparrow-ci 1.1.1 → 1.1.2

package/bin/ci.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 15:56:29
  * @LastEditors: wangqi
- * @LastEditTime: 2023-02-03 16:40:26
+ * @LastEditTime: 2023-02-10 14:04:51
  * @FilePath: /sparrow-ci/bin/ci.js
  * @Description: 
 */
@@ -262,6 +262,31 @@ class Ci {
     await this.upload('publish');
   }
 
+  // 读取git tag 修改配置
+  async changeVerConfig() {
+    try {
+      //获取文件路径
+      const filepath = path.join(__dirname, '../git_tag.sh');
+      // 执行git tag
+      let firstTag = await handleExecFile(filepath);
+      firstTag = firstTag.split('\n')[0].trim(); // 获取第一个tag
+      let blankFlag = firstTag.indexOf(' '); // 第一个空格位置
+      const config = {
+        version: firstTag.slice(0, blankFlag).trim() || '',
+        description: firstTag.slice(blankFlag + 1).trim() || '',
+      }
+      if (config.version.indexOf('v') > 0) {
+        config.version = config.version.split('v')[1];
+      }
+      return config.version && config.description ? config : null;
+    } catch (err) {
+      console.log('==============');
+      console.log('read tag err:', chalk.yellow(err));
+      console.log('==============');
+      return null;
+    }
+  }
+
   // 上传代码
   // @isPublish 是否自动上传
   async upload(type = 'upload') {
@@ -275,8 +300,13 @@ class Ci {
 
     if (type === 'online') {
       this.robotNum = robotList['online']; // 如果是online, 上传着变为1
+      const { version, description } = await this.changeVerConfig(); // online 走这块改变config
+      if (version && description) {
+        this.version = version;
+        this.description = description;
+      }
     }
-
+    
     await uploadCi({
       projectPath: this.projectRoot,
       version: this.version,
@@ -285,6 +315,7 @@ class Ci {
       appid: this.appid,
       robotNum: this.robotNum,
     });
+
     if (type === 'online') return;
     const packageObj = require(this.versionJSONPath);
     packageObj.version = handleVersion(this.version);

package/bin/utils/node_utils.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-26 10:39:50
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-24 12:54:56
+ * @LastEditTime: 2023-02-10 12:55:39
  * @FilePath: /sparrow-ci/bin/utils/node_utils.js
  * @Description: 工具方法
  */
@@ -205,6 +205,7 @@ async function handleExecFile(filePath) {
   console.log(stdout);
   console.log(stderr);
   console.log('===================================');
+  return stdout;
 }
 
 /**

package/git_tag.sh

@@ -0,0 +1,9 @@
+###
+ # @Author: wangqi
+ # @Date: 2022-05-06 10:24:20
+ # @LastEditors: wangqi
+ # @LastEditTime: 2023-02-10 14:02:17
+ # @FilePath: /sparrow-ci/git_tag.sh
+ # @Description: git tag脚本命令
+###
+git tag -n --sort=-taggerdate | head -n 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparrow-ci",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "基于miniprogram-ci开发的小程序命令行工具",
   "main": "",
   "bin": {