From a21049bbe9b0b9a645904641cffb4e990127b15c Mon Sep 17 00:00:00 2001
From: saqqdy <saqqdy@qq.com>
Date: Thu, 15 Jul 2021 21:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E8=B5=B7=E4=BA=86=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/gitm-admin.js   | 4 ++--
 bin/gitm-combine.js | 4 ++--
 docs/changelog.md   | 4 ++++
 package.json        | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/gitm-admin.js b/bin/gitm-admin.js
index 8f87910d..3459aa4d 100755
--- 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
index bdb4a05a..fb955d1b 100755
--- 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
index 9a1ba8a1..f1afe8af 100644
--- 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
index 538876ec..d0b5a99c 100644
--- 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",