From 2008d3601a77a2a90f31b34509ac110fbc3dde3f Mon Sep 17 00:00:00 2001 From: gabriel klawitter Date: Tue, 31 Mar 2020 23:03:35 +0530 Subject: [PATCH] ci: check_polkadot_companion_status: don't verify mergeable_state (#5473) --- substrate/.maintain/gitlab/check_polkadot_companion_status.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/substrate/.maintain/gitlab/check_polkadot_companion_status.sh b/substrate/.maintain/gitlab/check_polkadot_companion_status.sh index e98a657460..b54f457dc5 100755 --- a/substrate/.maintain/gitlab/check_polkadot_companion_status.sh +++ b/substrate/.maintain/gitlab/check_polkadot_companion_status.sh @@ -76,11 +76,11 @@ then exit 0 fi -if jq -e '.mergeable and .mergeable_state == "clean"' < companion_pr.json >/dev/null +if jq -e '.mergeable' < companion_pr.json >/dev/null then boldprint "polkadot pr #${pr_companion} mergeable" else - boldprint "polkadot pr #${pr_companion} not mergeable or clean" + boldprint "polkadot pr #${pr_companion} not mergeable" exit 1 fi