From patchwork Sat Jul 6 16:07:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1957617 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=DUupBlah; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hauke-m.de header.i=@hauke-m.de header.a=rsa-sha256 header.s=MBO0001 header.b=FH/MxnAr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WGb1N1KDJz1xrF for ; Sun, 7 Jul 2024 02:09:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ss7k16knXO03rv5sM9eqaMnnRTpCJnOsv0MEyXz+YBw=; b=DUupBlahvJ2g+9 EsSqVbqjocXTLfAZXlU8n0vHwgyRQwcdoe0uxVWeM0iSLxVow9qo7vY1cTnQk/PDFSWEM06M2xGaX hIFSDanqn3iZsmyC7F/t59PdxyJrO3BZxjYfvJ0ckt0IQCqwg1exbf0rhPRAfCVZ4fcYDrpy+K2WR 3gXIb23iBfhkc3x4umHpzzOGbtxxYIOpHP+4+e6KCZSwXVLEwRzoB9i+iikuCk0TONzL5diPyv+lP S3G9bLRrnTqdihfjLFUsSKtYL5X7lM5njfOUpSr0JM92AaJO8pEn5vZVe+l/IYOXGwvkKkpp0piIl vsartyGgc1S9A6M9/dpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQ7xB-00000000R9E-2WT9; Sat, 06 Jul 2024 16:08:01 +0000 Received: from mout-p-101.mailbox.org ([80.241.56.151]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQ7x4-00000000R6j-3cmN for openwrt-devel@lists.openwrt.org; Sat, 06 Jul 2024 16:07:57 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4WGZzQ5G17z9sbg; Sat, 6 Jul 2024 18:07:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1720282066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QeX1uOOOxRqYqKgK3rzzYZCm5V6q92g8Pb8FIHb9yag=; b=FH/MxnArxXyX+npNhgX98Lq7sEndI+feMtaIxrcmt4D0qHt9VsssAZa38HxLJQTb2bJYhj d0pjETsJwg/9zfmOB4tH3NAiE7h+Pf2uXU3XkTfOo++4fNQzHSBk0hFTDuCPaPERExSKpz pRU47s7fTTDn+bJNWm1stjOn1d0S/SAI9lgo0FM1yRvWrO5K6w3DLNsK42haGUyszpygDq pToCfk8qM2fb5oS48mu3h93OuKBBeYdOHUxXhbnMP4q55DtccCm0F1sw3I6cRA5yn2VUgY PToe83XANZNPiBY+kwSKNJe6VGy/BVjELa4IKQhKhqSLaJyFeIwbiTpTcNN8ew== From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Cc: ansuelsmth@gmail.com, Hauke Mehrtens Subject: [maintainer-tools PATCH 3/4] github-merge-pr: Add option to ignore .mergeable Date: Sat, 6 Jul 2024 18:07:24 +0200 Message-ID: <20240706160725.3257906-4-hauke@hauke-m.de> In-Reply-To: <20240706160725.3257906-1-hauke@hauke-m.de> References: <20240706160725.3257906-1-hauke@hauke-m.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4WGZzQ5G17z9sbg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240706_090755_126643_7D298F9D X-CRM114-Status: UNSURE ( 7.44 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The option IGNORE_MERGEABLE allows to ignore if the PR is mergeable. This allows to prepare PRs which can not be force pushed with this script. Signed-off-by: Hauke Mehrtens --- github-merge-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Content analysis details: (-0.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.151 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The option IGNORE_MERGEABLE allows to ignore if the PR is mergeable. This allows to prepare PRs which can not be force pushed with this script. Signed-off-by: Hauke Mehrtens --- github-merge-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-merge-pr.sh b/github-merge-pr.sh index 76aec20..f294c85 100755 --- a/github-merge-pr.sh +++ b/github-merge-pr.sh @@ -123,7 +123,7 @@ fi echo "Fetching remote $PR_USER" $GIT fetch $PR_USER $PR_BRANCH -if [ "$(echo "$PR_INFO" | jq -r ".maintainer_can_modify")" == "true" ]; then +if [ "$(echo "$PR_INFO" | jq -r ".maintainer_can_modify")" == "true" ] || [ "$IGNORE_MERGEABLE" = "1" ]; then echo "Creating branch $LOCAL_PR_BRANCH for $PR_BRANCH" if ! $GIT checkout -b $LOCAL_PR_BRANCH $PR_USER/$PR_BRANCH; then echo "Failed to checkout new branch $PR_BRANCH from $PR_USER/$PR_BRANCH" >&2