Merge branch 'dev'

saqqdy · Jul 15, 2021 · 086b33e · 086b33e · vercel · Jul 15, 2021
2 parents db6ca01 + a21049b
commit 086b33e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bin/gitm-admin.js b/bin/gitm-admin.js
@@ -187,7 +187,7 @@ if (publish.args.length > 0) {
                               }
                           ]
                 )
-                if (opt.build) {
+                if (opt.build && (!level || level < 3)) {
                     cmd[type] = cmd[type].concat([
                         {
                             cmd: `gitm build ${appName} --env bug --app ${opt.build === true ? 'all' : opt.build}`,
@@ -197,7 +197,7 @@ if (publish.args.length > 0) {
                 }
             }
             // 发布release
-            if (type === 'release' && opt.build) {
+            if (type === 'release' && opt.build && (!level || level < 3)) {
                 cmd[type] = cmd[type].concat([
                     {
                         cmd: `gitm build ${appName} --env prod --app ${opt.build === true ? 'all' : opt.build}`,

diff --git a/bin/gitm-combine.js b/bin/gitm-combine.js
@@ -83,7 +83,7 @@ program.action(async (type, name, opt) => {
                 },
                 `git checkout ${type}/${name}`
             ])
-            if (opt.build) {
+            if (opt.build && (!level || level < 3)) {
                 cmd = cmd.concat([
                     {
                         cmd: `gitm build ${appName} --env dev --app ${opt.build === true ? 'all' : opt.build}`,
@@ -186,7 +186,7 @@ program.action(async (type, name, opt) => {
                 )
             }
             // 仅支持构建bug
-            if (opt.build) {
+            if (opt.build && (!level || level < 3)) {
                 if (type === 'bugfix') {
                     cmd = cmd.concat([
                         {

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,7 @@
+# 2021.07.15 v2.2.4 更新日志
+
+1. 修复无合并权限调起了构建的问题
+
 # 2021.07.04 v2.2.3 更新日志
 
 1. gitm update支持--all一键升级本地所有分支

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "gitmars",
     "description": "一个高度定制化的git工作流工具",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "scripts": {
         "docs:dev": "vuepress dev docs",
         "docs:build": "vuepress build docs",