cloudcc-cli 0.7.9 → 0.8.3

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
  1. package/README.md +28 -0
  2. package/package.json +1 -1
  3. package/src/publishProject.js +10 -4
  4. package/utils/changeVersion copy.js +75 -0
  5. package/utils/changeVersion.js +23 -57
  6. package/utils/pushCode.js +7 -5
  7. package/utils/test.js +4 -0
package/README.md CHANGED
@@ -1,3 +1,31 @@
1
+ # ReleaseV0.8.3
2
+ #### 发布日期：2021-11-25
3
+ #### 发布范围：全量
4
+ #### 发布内容
5
+ * 优化
6
+ * 更改生成version逻辑
7
+
8
+ # ReleaseV0.8.2
9
+ #### 发布日期：2021-11-24
10
+ #### 发布范围：全量
11
+ #### 发布内容
12
+ * 优化
13
+ * 推送代码如果失败，强制退出
14
+
15
+ # ReleaseV0.8.1
16
+ #### 发布日期：2021-11-18
17
+ #### 发布范围：全量
18
+ #### 发布内容
19
+ * 优化
20
+ * version末尾最大为1W
21
+
22
+ # ReleaseV0.8.0
23
+ #### 发布日期：2021-11-17
24
+ #### 发布范围：全量
25
+ #### 发布内容
26
+ * 优化
27
+ * 优化触发Jenkins请求
28
+
1
29
  # ReleaseV0.7.9
2
30
  #### 发布日期：2021-11-16
3
31
  #### 发布范围：全量
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cloudcc-cli",
3
- "version": "0.7.9",
3
+ "version": "0.8.3",
4
4
  "description": "cloudcc-cli",
5
5
  "keywords": [
6
6
  "cloudcc",
package/src/publishProject.js CHANGED
@@ -55,11 +55,17 @@ class Publish {
55
55
  } catch (error) {
56
56
  console.log(chalk.red("版本信息写入异常：" + error))
57
57
  }
58
+
58
59
  // 发布代码并设置tags,触发发布,飞书提醒
59
- pushCodeAndTags([condition.type]) && jenkins(projectConfig.config["jenkins-" + condition.type]) && notifyFeishu(condition.type, version, projectConfig);
60
- console.log();
61
- console.log(chalk.green('发布完成'));
62
- console.log();
60
+ if (pushCodeAndTags([condition.type])) {
61
+ if (projectConfig && projectConfig.config) {
62
+ jenkins(projectConfig.config["jenkins-" + condition.type])
63
+ }
64
+ notifyFeishu(condition.type, version, projectConfig)
65
+ console.log();
66
+ console.log(chalk.green('发布完成'));
67
+ console.log();
68
+ }
63
69
  }
64
70
  }
65
71
  }
package/utils/changeVersion copy.js ADDED
@@ -0,0 +1,75 @@
1
+
2
+ function change(ori) {
3
+ //   let ori = "12.0.9";
4
+ let split = ori.split(".");
5
+ let ret = "";
6
+ if (split.length == 4) {
7
+ // 12.1.0.0 形式的
8
+ for (let i = 0; i < split.length; i++) {
9
+ let last = split[3];
10
+ if (last < 9999) {
11
+ last++;
12
+ ret = split[0] + "." + split[1] + "." + split[2] + "." + last;
13
+ break;
14
+ } else {
15
+ let second = split[2];
16
+ if (second < 9) {
17
+ second++;
18
+ ret = split[0] + "." + split[1] + "." + second + ".0";
19
+ break;
20
+ } else {
21
+ let third = split[1];
22
+ if (third < 9) {
23
+ third++;
24
+ ret = split[0] + "." + third + ".0" + ".0";
25
+ break;
26
+ } else {
27
+ let forth = split[0];
28
+ forth++;
29
+ ret = forth + ".0.0.0";
30
+ break;
31
+ }
32
+ }
33
+ }
34
+ }
35
+ return ret;
36
+ } else {
37
+ // 12.0.9 形式的
38
+ for (let i = 0; i < split.length; i++) {
39
+ let last = split[2];
40
+ if (last < 9) {
41
+ last++;
42
+ ret = split[0] + "." + split[1] + "." + last;
43
+ break;
44
+ } else {
45
+ let second = split[1];
46
+ if (second < 9) {
47
+ second++;
48
+ ret = split[0] + "." + second + ".0";
49
+ break;
50
+ } else {
51
+ let third = split[0];
52
+ third++;
53
+ ret = third + ".0.0";
54
+ break;
55
+ }
56
+ }
57
+ }
58
+ return ret;
59
+ }
60
+ }
61
+ module.exports = { change }
62
+
63
+
64
+
65
+ /**
66
+ * 修改版本号
67
+ * @param {ori} 版本号
68
+ * @param {type} 类型：Dev,uat,GA,Release
69
+ * @returns 新的版本号
70
+ */
71
+ // 需要更新第二位
72
+ const updateSecond = ["Release"];
73
+
74
+ // 需要更新第三位
75
+ const updateLast = ["Dev", "uat", "GA", "RC"];
package/utils/changeVersion.js CHANGED
@@ -1,61 +1,27 @@
1
- module.exports = {
2
- change(ori) {
3
- //   let ori = "12.0.9";
4
- let split = ori.split(".");
1
+ /**
2
+ * 修改版本号
3
+ * @param {ori} 版本号：12.0.123
4
+ * @param {type} 类型：Dev,uat,GA,Release
5
+ * @returns 新的版本号
6
+ */
7
+ // 需要更新第二位
8
+ const updateSecond = ["Release"];
9
+
10
+ // 需要更新第三位
11
+ const updateLast = ["Dev", "uat", "GA", "RC"];
12
+
13
+ function change(version, type) {
14
+ if (version) {
15
+ let split = version.split(".");
5
16
  let ret = "";
6
- if (split.length == 4) {
7
- // 12.1.0.0 形式的
8
- for (let i = 0; i < split.length; i++) {
9
- let last = split[3];
10
- if (last < 99) {
11
- last++;
12
- ret = split[0] + "." + split[1] + "." + split[2] + "." + last;
13
- break;
14
- } else {
15
- let second = split[2];
16
- if (second < 9) {
17
- second++;
18
- ret = split[0] + "." + split[1] + "." + second + ".0";
19
- break;
20
- } else {
21
- let third = split[1];
22
- if (third < 9) {
23
- third++;
24
- ret = split[0] + "." + third + ".0" + ".0";
25
- break;
26
- } else {
27
- let forth = split[0];
28
- forth++;
29
- ret = forth + ".0.0.0";
30
- break;
31
- }
32
- }
33
- }
17
+ if (split && split.length === 3) {
18
+ if (updateSecond.includes(type)) {
19
+ ret = split[0] + "." + (++split[1]) + "." + split[2];
20
+ } else if (updateLast.includes(type)) {
21
+ ret = split[0] + "." + split[1] + "." + (++split[2]);
34
22
  }
35
- return ret;
36
- } else {
37
- // 12.0.9 形式的
38
- for (let i = 0; i < split.length; i++) {
39
- let last = split[2];
40
- if (last < 9) {
41
- last++;
42
- ret = split[0] + "." + split[1] + "." + last;
43
- break;
44
- } else {
45
- let second = split[1];
46
- if (second < 9) {
47
- second++;
48
- ret = split[0] + "." + second + ".0";
49
- break;
50
- } else {
51
- let third = split[0];
52
- third++;
53
- ret = third + ".0.0";
54
- break;
55
- }
56
- }
57
- }
58
- return ret;
59
23
  }
24
+ return ret;
60
25
  }
61
- }
26
+ }
27
+ module.exports = { change }
package/utils/pushCode.js CHANGED
@@ -31,9 +31,9 @@ function push(version) {
31
31
  console.log();
32
32
  console.log(chalk.green('代码推送成功！'));
33
33
  } catch (error) {
34
- console.log(chalk.red('代码推送失败，请稍后手动推送！'));
34
+ console.log(chalk.red('代码推送失败，本地代码与线上不同步，请先 git pull 同步！'));
35
35
  console.log();
36
- // return false;
36
+ return false;
37
37
  }
38
38
  return true
39
39
  }
@@ -102,12 +102,14 @@ function getNewVersionName(types) {
102
102
  exec("git fetch --tags -f")
103
103
  return types.map((item) => {
104
104
  // 更新本地tag
105
- let version = exec(`git tag --list ${item}-V* --sort -version:refname`)
105
+ let version = exec(`git log --oneline --tags -1`)
106
106
  version = version.toString("utf8").trim();
107
107
  if (version) {
108
- version = version.split("\n")[0]
108
+ // 取版本号
109
109
  version = version.split("-V")[1]
110
- version = changeVersion.change(version)
110
+ // 改变版本号
111
+ version = changeVersion.change(version, item)
112
+ // 生成最后的版本号
111
113
  item = item + "-V" + version
112
114
  } else {
113
115
  item = item + "-V0.0.1"
package/utils/test.js ADDED
@@ -0,0 +1,4 @@
1
+ version = "Release-V12.3.2"
2
+ version = version.split("\n")[0]
3
+ version = version.split("-V")[1]
4
+ console.log("Release-V12.3.2",version);