Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Remove polkadot companion detection from branch name (#6565)
Browse files Browse the repository at this point in the history
* Initial commit

Forked at: facc674
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.
  • Loading branch information
cecton authored Jul 3, 2020
1 parent facc674 commit 7e3cf94
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions .maintain/gitlab/check_polkadot_companion_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7e3cf94

Please sign in to comment.