npm - cloudcc-cli - Versions diffs - 0.8.1 → 0.8.5 - Mend

cloudcc-cli 0.8.1 → 0.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md +28 -0
package/package.json +1 -1
package/src/publishProject.js +8 -7
package/utils/changeVersion copy.js +75 -0
package/utils/changeVersion.js +21 -55
package/utils/pushCode.js +12 -7
package/utils/test.js +4 -0

package/README.md CHANGED Viewed

@@ -1,3 +1,31 @@
+# ReleaseV0.8.5
+#### 发布日期：2021-11-25
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * RC加入升级第二位version
+# ReleaseV0.8.4
+#### 发布日期：2021-11-25
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * 打印version信息
+# ReleaseV0.8.3
+#### 发布日期：2021-11-25
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * 更改生成version逻辑
+# ReleaseV0.8.2
+#### 发布日期：2021-11-24
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * 推送代码如果失败，强制退出
 # ReleaseV0.8.1
 #### 发布日期：2021-11-18
 #### 发布范围：全量

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "0.8.1",
+  "version": "0.8.5",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",

package/src/publishProject.js CHANGED Viewed

@@ -57,14 +57,15 @@ class Publish {
                 }
                 // 发布代码并设置tags,触发发布,飞书提醒
-                pushCodeAndTags([condition.type])
-                if (projectConfig && projectConfig.config) {
-                    jenkins(projectConfig.config["jenkins-" + condition.type])
+                if (pushCodeAndTags([condition.type])) {
+                    if (projectConfig && projectConfig.config) {
+                        jenkins(projectConfig.config["jenkins-" + condition.type])
+                    }
+                    notifyFeishu(condition.type, version, projectConfig)
+                    console.log();
+                    console.log(chalk.green('发布完成'));
+                    console.log();
                 }
-                notifyFeishu(condition.type, version, projectConfig)
-                console.log();
-                console.log(chalk.green('发布完成'));
-                console.log();
             }
         }
     }

package/utils/changeVersion copy.js ADDED Viewed

@@ -0,0 +1,75 @@
+function change(ori) {
+    //   let ori = "12.0.9";
+    let split = ori.split(".");
+    let ret = "";
+    if (split.length == 4) {
+        // 12.1.0.0 形式的
+        for (let i = 0; i < split.length; i++) {
+            let last = split[3];
+            if (last < 9999) {
+                last++;
+                ret = split[0] + "." + split[1] + "." + split[2] + "." + last;
+                break;
+            } else {
+                let second = split[2];
+                if (second < 9) {
+                    second++;
+                    ret = split[0] + "." + split[1] + "." + second + ".0";
+                    break;
+                } else {
+                    let third = split[1];
+                    if (third < 9) {
+                        third++;
+                        ret = split[0] + "." + third + ".0" + ".0";
+                        break;
+                    } else {
+                        let forth = split[0];
+                        forth++;
+                        ret = forth + ".0.0.0";
+                        break;
+                    }
+                }
+            }
+        }
+        return ret;
+    } else {
+        // 12.0.9 形式的
+        for (let i = 0; i < split.length; i++) {
+            let last = split[2];
+            if (last < 9) {
+                last++;
+                ret = split[0] + "." + split[1] + "." + last;
+                break;
+            } else {
+                let second = split[1];
+                if (second < 9) {
+                    second++;
+                    ret = split[0] + "." + second + ".0";
+                    break;
+                } else {
+                    let third = split[0];
+                    third++;
+                    ret = third + ".0.0";
+                    break;
+                }
+            }
+        }
+        return ret;
+    }
+}
+module.exports = { change }
+/**
+ * 修改版本号
+ * @param {ori} 版本号
+ * @param {type} 类型：Dev,uat,GA,Release
+ * @returns 新的版本号
+ */
+// 需要更新第二位
+const updateSecond = ["Release"];
+// 需要更新第三位
+const updateLast = ["Dev", "uat", "GA", "RC"];

package/utils/changeVersion.js CHANGED Viewed

@@ -1,61 +1,27 @@
+/**
+ * 修改版本号
+ * @param {ori} 版本号：12.0.123
+ * @param {type} 类型：Dev,uat,GA,Release
+ * @returns 新的版本号
+ */
+// 需要更新第二位
+const updateSecond = ["Release", "GA"];
-function change(ori) {
-    //   let ori = "12.0.9";
-    let split = ori.split(".");
-    let ret = "";
-    if (split.length == 4) {
-        // 12.1.0.0 形式的
-        for (let i = 0; i < split.length; i++) {
-            let last = split[3];
-            if (last < 9999) {
-                last++;
-                ret = split[0] + "." + split[1] + "." + split[2] + "." + last;
-                break;
-            } else {
-                let second = split[2];
-                if (second < 9) {
-                    second++;
-                    ret = split[0] + "." + split[1] + "." + second + ".0";
-                    break;
-                } else {
-                    let third = split[1];
-                    if (third < 9) {
-                        third++;
-                        ret = split[0] + "." + third + ".0" + ".0";
-                        break;
-                    } else {
-                        let forth = split[0];
-                        forth++;
-                        ret = forth + ".0.0.0";
-                        break;
-                    }
-                }
-            }
-        }
-        return ret;
-    } else {
-        // 12.0.9 形式的
-        for (let i = 0; i < split.length; i++) {
-            let last = split[2];
-            if (last < 9) {
-                last++;
-                ret = split[0] + "." + split[1] + "." + last;
-                break;
-            } else {
-                let second = split[1];
-                if (second < 9) {
-                    second++;
-                    ret = split[0] + "." + second + ".0";
-                    break;
-                } else {
-                    let third = split[0];
-                    third++;
-                    ret = third + ".0.0";
-                    break;
-                }
+// 需要更新第三位
+const updateLast = ["Dev", "uat", "RC"];
+function change(version, type) {
+    if (version) {
+        let split = version.split(".");
+        let ret = "";
+        if (split && split.length === 3) {
+            if (updateSecond.includes(type)) {
+                ret = split[0] + "." + (++split[1]) + "." + split[2];
+            } else if (updateLast.includes(type)) {
+                ret = split[0] + "." + split[1] + "." + (++split[2]);
             }
         }
         return ret;
     }
 }
-module.exports = { change }
+module.exports = { change }

package/utils/pushCode.js CHANGED Viewed

@@ -31,9 +31,9 @@ function push(version) {
         console.log();
         console.log(chalk.green('代码推送成功！'));
     } catch (error) {
-        console.log(chalk.red('代码推送失败，请稍后手动推送！'));
+        console.log(chalk.red('代码推送失败，本地代码与线上不同步，请先 git pull 同步！'));
         console.log();
-        // return false;
+        return false;
     }
     return true
 }
@@ -81,10 +81,10 @@ function setTag(types, versions) {
     // 添加tag
     versions.map((version) => {
-        exec("git tag " + version)
+        exec("git tag " + version + " -f")
     })
     types.map((type) => {
-        exec("git tag " + type)
+        exec("git tag " + type + " -f")
     })
     // 推送tag
@@ -102,12 +102,14 @@ function getNewVersionName(types) {
     exec("git fetch --tags -f")
     return types.map((item) => {
         // 更新本地tag
-        let version = exec(`git tag --list ${item}-V* --sort -version:refname`)
+        let version = exec(`git log --oneline --tags -1`)
         version = version.toString("utf8").trim();
         if (version) {
-            version = version.split("\n")[0]
+            // 取版本号
             version = version.split("-V")[1]
-            version = changeVersion.change(version)
+            // 改变版本号
+            version = changeVersion.change(version, item)
+            // 生成最后的版本号
             item = item + "-V" + version
         } else {
             item = item + "-V0.0.1"
@@ -122,6 +124,9 @@ function getNewVersionName(types) {
  */
 function pushCodeAndTags(types = []) {
     let versions = getNewVersionName(types);
+    console.log();
+    console.log(chalk.green('待发布版本：' + versions));
+    console.log();
     return push(versions[0]) && setTag(types, versions)
 }
 module.exports = { pushCodeAndTags, push, getNewVersionName, setTag }

package/utils/test.js ADDED Viewed

@@ -0,0 +1,4 @@
+version = "Release-V12.3.2"
+version = version.split("\n")[0]
+version = version.split("-V")[1]
+console.log("Release-V12.3.2",version);