mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 02:21:04 +00:00
Remove polkadot companion detection from branch name (#6565)
* Initial commit
Forked at: f54614e256
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.
This commit is contained in:
@@ -86,17 +86,9 @@ then
|
||||
git fetch origin refs/pull/${pr_companion}/head:pr/${pr_companion}
|
||||
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
|
||||
fi
|
||||
rm -f "${pr_data_file}"
|
||||
else
|
||||
boldprint "this is not a pull request - building polkadot:master"
|
||||
|
||||
Reference in New Issue
Block a user