From 2ddbbd7c08d70c773473954e14a5f26b35cc7134 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 3 Jul 2020 17:29:08 +0200 Subject: [PATCH] Remove polkadot companion detection from branch name (#6565) * Initial commit Forked at: f54614e2562fad6d244392e9b7873a170193f923 Parent branch: origin/master * Remove polkadot companion detection from branch name Even though it was nice it was also error prone as there were no indication whatsoever on the PR that a polkadot companion branch exists. --- .../.maintain/gitlab/check_polkadot_companion_build.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/substrate/.maintain/gitlab/check_polkadot_companion_build.sh b/substrate/.maintain/gitlab/check_polkadot_companion_build.sh index 26ee73ef71..e68ce45b3f 100755 --- a/substrate/.maintain/gitlab/check_polkadot_companion_build.sh +++ b/substrate/.maintain/gitlab/check_polkadot_companion_build.sh @@ -87,15 +87,7 @@ then git checkout pr/${pr_companion} git merge origin/master else - pr_ref="$(grep -Po '"ref"\s*:\s*"\K(?!master)[^"]*' "${pr_data_file}")" - if git fetch origin "$pr_ref":branch/"$pr_ref" 2>/dev/null - then - boldprint "companion branch detected: $pr_ref" - git checkout branch/"$pr_ref" - git merge origin/master - else - boldprint "no companion branch found - building polkadot:master" - fi + boldprint "no companion branch found - building polkadot:master" fi rm -f "${pr_data_file}" else