pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 02:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove polkadot companion detection from branch name (#6565)

Browse Source 
* 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:
Cecile Tonglet
2020-07-03 17:29:08 +02:00
committed by GitHub
parent f54614e256
commit 2ddbbd7c08
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/.maintain/gitlab/check_polkadot_companion_build.sh
+1 -9
View File
@@ -87,15 +87,7 @@ then
git checkout pr/${pr_companion} git checkout pr/${pr_companion}
git merge origin/master git merge origin/master
else else
pr_ref="$(grep -Po '"ref"\s*:\s*"\K(?!master)[^"]*' "${pr_data_file}")" boldprint "no companion branch found - building polkadot:master"
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 fi
rm -f "${pr_data_file}" rm -f "${pr_data_file}"
else else